diff --git a/.editorconfig b/.editorconfig
index 8d54e327b9f93..1d2259154e486 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -44,6 +44,10 @@ indent_size = 4
 indent_size = 2
 indent_style = space
 
+# Match package.json, which are generally pulled from upstream and accept them as they are
+[package.json]
+indent_style = unset
+
 # Disable file types or individual files
 # some of these files may be auto-generated and/or require significant changes
 
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f6ffeb9b122a5..d83dc1efe44ff 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -153,3 +153,6 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
 
 # nixos/ollama: format with nixfmt-rfc-style (#329561)
 246d1ee533810ac1946d863bbd9de9b525818d56
+
+# nixos/nvidia: apply nixfmt-rfc-style (#313440)
+fbdcdde04a7caa007e825a8b822c75fab9adb2d6
diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md
index 21636df8017b6..0168ea39f7aa1 100644
--- a/doc/build-helpers/dev-shell-tools.chapter.md
+++ b/doc/build-helpers/dev-shell-tools.chapter.md
@@ -27,3 +27,49 @@ devShellTools.valueToString (builtins.toFile "foo" "bar")
 devShellTools.valueToString false
 => ""
 ```
+
+:::
+
+## `devShellTools.unstructuredDerivationInputEnv` {#sec-devShellTools-unstructuredDerivationInputEnv}
+
+Convert a set of derivation attributes (as would be passed to [`derivation`]) to a set of environment variables that can be used in a shell script.
+This function does not support `__structuredAttrs`, but does support `passAsFile`.
+
+:::{.example}
+## `unstructuredDerivationInputEnv` usage example
+
+```nix
+devShellTools.unstructuredDerivationInputEnv {
+  drvAttrs = {
+    name = "foo";
+    buildInputs = [ hello figlet ];
+    builder = bash;
+    args = [ "-c" "${./builder.sh}" ];
+  };
+}
+=> {
+  name = "foo";
+  buildInputs = "/nix/store/...-hello /nix/store/...-figlet";
+  builder = "/nix/store/...-bash";
+}
+```
+
+Note that `args` is not included, because Nix does not added it to the builder process environment.
+
+:::
+
+## `devShellTools.derivationOutputEnv` {#sec-devShellTools-derivationOutputEnv}
+
+Takes the relevant parts of a derivation and returns a set of environment variables, that would be present in the derivation.
+
+:::{.example}
+## `derivationOutputEnv` usage example
+
+```nix
+let
+  pkg = hello;
+in
+devShellTools.derivationOutputEnv { outputList = pkg.outputs; outputMap = pkg; }
+```
+
+:::
diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index 602cef59677e3..ca4694f3d11c8 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation (
 
       nixos-render-docs manual html \
         --manpage-urls ./manpage-urls.json \
-        --revision ${lib.trivial.revisionWithDefault (nixpkgs.rev or "master")} \
+        --revision ${nixpkgs.rev or "master"} \
         --stylesheet style.css \
         --stylesheet highlightjs/mono-blue.css \
         --script ./highlightjs/highlight.pack.js \
diff --git a/doc/interoperability.md b/doc/interoperability.md
new file mode 100644
index 0000000000000..21a88116d3075
--- /dev/null
+++ b/doc/interoperability.md
@@ -0,0 +1,5 @@
+# Interoperability Standards {#part-interoperability}
+
+```{=include=} chapters
+interoperability/cyclonedx.md
+```
diff --git a/doc/interoperability/cyclonedx.md b/doc/interoperability/cyclonedx.md
new file mode 100644
index 0000000000000..7a3dea3dbc2f8
--- /dev/null
+++ b/doc/interoperability/cyclonedx.md
@@ -0,0 +1,79 @@
+# CycloneDX {#chap-interop-cyclonedx}
+
+[OWASP](https://owasp.org/) [CycloneDX](https://cyclonedx.org/) is a Software [Bill of Materials](https://en.wikipedia.org/wiki/Bill_of_materials) (SBOM) standard.
+The standards described here are for including Nix specific information within SBOMs in a way that is interoperable with external SBOM tooling.
+
+## `nix` Namespace Property Taxonomy  {#sec-interop.cylonedx-nix}
+
+The following tables describe namespaces for [properties](https://cyclonedx.org/docs/1.6/json/#components_items_properties) that may be attached to components within SBOMs.
+Component properties are lists of name-value-pairs where values must be strings.
+Properties with the same name may appear more than once.
+Names and values are case-sensitive.
+
+| Property         | Description |
+|------------------|-------------|
+| `nix:store_path` | A Nix store path for the given component. This property should be contextualized by additional properties that describe the production of the store path, such as those from the `nix:narinfo:` and `nix:fod` namespaces. |
+
+
+| Namespace     | Description |
+|---------------|-------------|
+| [`nix:narinfo`](#sec-interop.cylonedx-narinfo) | Namespace for properties that are specific to how a component is stored as a [Nix archive](https://nixos.org/manual/nix/stable/glossary#gloss-nar) (NAR) in a [binary cache](https://nixos.org/manual/nix/stable/glossary#gloss-binary-cache). |
+| [`nix:fod`](#sec-interop.cylonedx-fod) | Namespace for properties that describe a [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary#gloss-fixed-output-derivation). |
+
+
+### `nix:narinfo` {#sec-interop.cylonedx-narinfo}
+
+Narinfo properties describe component archives that may be available from binary caches.
+The `nix:narinfo` properties should be accompanied by a `nix:store_path` property within the same property list.
+
+| Property                  | Description |
+|---------------------------|-------------|
+| `nix:narinfo:store_path`  | Store path for the given store component. |
+| `nix:narinfo:url`         | URL path component. |
+| `nix:narinfo:nar_hash`    | Hash of the file system object part of the component when serialized as a Nix Archive. |
+| `nix:narinfo:nar_size`    | Size of the component when serialized as a Nix Archive. |
+| `nix:narinfo:compression` | The compression format that component archive is in. |
+| `nix:narinfo:file_hash`   | A digest for the compressed component archive itself, as opposed to the data contained within. |
+| `nix:narinfo:file_size`   | The size of the compressed component archive itself. |
+| `nix:narinfo:deriver`     | The path to the derivation from which this component is produced. |
+| `nix:narinfo:system`      | The hardware and software platform on which this component is produced. |
+| `nix:narinfo:sig`         | Signatures claiming that this component is what it claims to be. |
+| `nix:narinfo:ca`          | Content address of this store object's file system object, used to compute its store path. |
+| `nix:narinfo:references`  | A whitespace separated array of store paths that this component references. |
+
+### `nix:fod` {#sec-interop.cylonedx-fod}
+
+FOD properties describe a [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary#gloss-fixed-output-derivation).
+The `nix:fod:method` property is required and must be accompanied by a `nix:store_path` property within the same property list.
+All other properties in this namespace are method-specific.
+To reproduce the build of a component the `nix:fod:method` value is resolved to an [appropriate function](#chap-pkgs-fetchers) within Nixpkgs whose arguments intersect with the given properties.
+When generating `nix:fod` properties the method selected should be a stable function with a minimal number arguments.
+For example, the `fetchFromGitHub` is commonly used within Nixpkgs but should be reduced to a call to the function by which it is implemented, `fetchzip`.
+
+| Property         | Description |
+|------------------|-------------|
+| `nix:fod:method` | Nixpkg function that produces this FOD. Required. Examples: `"fetchzip"`, `"fetchgit"` |
+| `nix:fod:name`   | Derivation name, present when method is `"fetchzip"` |
+| `nix:fod:ref`    | [Git ref](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefrefaref), present when method is `"fetchgit"` |
+| `nix:fod:rev`    | [Git rev](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefrevisionarevision), present when method is `"fetchgit"` |
+| `nix:fod:sha256` | FOD hash |
+| `nix:fod:url`    | URL to fetch |
+
+
+`nix:fod` properties may be extracted and evaluated to a derivation using code similar to the following, assuming a fictitious function `filterPropertiesToAttrs`:
+
+```nix
+{ pkgs, filterPropertiesToAttrs, properties }:
+let
+  fodProps = filterPropertiesToAttrs "nix:fod:" properties;
+
+  methods = {
+    fetchzip =
+      { name, url, sha256, ... }:
+      pkgs.fetchzip {
+        inherit name url sha256;
+      };
+  };
+
+in methods.${fodProps.method} fodProps
+```
diff --git a/doc/manual.md.in b/doc/manual.md.in
index 642247e166125..e5f58a23a3995 100644
--- a/doc/manual.md.in
+++ b/doc/manual.md.in
@@ -12,4 +12,5 @@ stdenv.md
 build-helpers.md
 development.md
 contributing.md
+interoperability.md
 ```
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a0f70a36a8f72..ebbac4149dd32 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4693,6 +4693,11 @@
     githubId = 3179832;
     name = "D. Bohdan";
   };
+  d-brasher = {
+    github = "d-brasher";
+    githubId = 175485311;
+    name = "D. Brasher";
+  };
   dbrgn = {
     email = "nix@dbrgn.ch";
     github = "dbrgn";
@@ -14920,6 +14925,12 @@
     githubId = 16027994;
     name = "Nathan Viets";
   };
+  nw = {
+    email = "nixpkgs@nwhirschfeld.de";
+    github = "nwhirschfeld";
+    githubId = 5047052;
+    name = "Niclas Hirschfeld";
+  };
   nyadiia = {
     email = "nyadiia@pm.me";
     github = "nyadiia";
@@ -15049,6 +15060,12 @@
     githubId = 158758;
     name = "Oliver Dunkl";
   };
+  odygrd = {
+    email = "odysseas.georgoudis@gmail.com";
+    github = "odygrd";
+    githubId = 7397786;
+    name = "Odysseas Georgoudis";
+  };
   ofek = {
     email = "oss@ofek.dev";
     github = "ofek";
diff --git a/maintainers/scripts/convert-to-import-cargo-lock/shell.nix b/maintainers/scripts/convert-to-import-cargo-lock/shell.nix
index 8e913fdcd8be5..fc2e2348309d7 100644
--- a/maintainers/scripts/convert-to-import-cargo-lock/shell.nix
+++ b/maintainers/scripts/convert-to-import-cargo-lock/shell.nix
@@ -1,5 +1,17 @@
-with import ../../../. { };
-
+{
+  pkgs ? import ../../.. { },
+}:
+let
+  inherit (pkgs) lib stdenv mkShell;
+in
 mkShell {
-  packages = [ rustc cargo clippy rustfmt ] ++ lib.optional stdenv.isDarwin libiconv;
+  packages =
+    with pkgs;
+    [
+      rustc
+      cargo
+      clippy
+      rustfmt
+    ]
+    ++ lib.optional stdenv.isDarwin pkgs.libiconv;
 }
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 7359e4451ccf6..1530cd809fe7a 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -35,6 +35,7 @@ ldoc,,,,,,
 lgi,,,,,,
 linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,,
 ljsyscall,,,,,5.1,lblasc
+llscheck,,,,,,mrcjkb
 lmathx,,,,,5.3,alexshpilkin
 lmpfrlib,,,,,5.3,alexshpilkin
 loadkit,,,,,,alerque
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index a8007c9a0694a..d5ba9ca11fab3 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -231,6 +231,8 @@
   Explicitly set `kubelet.hostname` to `networking.fqdnOrHostName` to get back
   the old default behavior.
 
+- Docker now defaults to 27.x, because version 24.x stopped receiving security updates and bug fixes after [February 1, 2024](https://github.com/moby/moby/pull/46772#discussion_r1686464084).
+
 - `keycloak` was updated to version 25, which introduces new hostname related options.
   See [Upgrading Guide](https://www.keycloak.org/docs/25.0.1/upgrading/#migrating-to-25-0-0) for instructions.
 
diff --git a/nixos/lib/test-driver/shell.nix b/nixos/lib/test-driver/shell.nix
index 367bbad556c03..8879b1a0dc4c0 100644
--- a/nixos/lib/test-driver/shell.nix
+++ b/nixos/lib/test-driver/shell.nix
@@ -1,2 +1,4 @@
-with import ../../.. {};
-pkgs.callPackage ./default.nix {}
+{
+  pkgs ? import ../../.. { },
+}:
+pkgs.callPackage ./default.nix { }
diff --git a/nixos/maintainers/scripts/azure-new/shell.nix b/nixos/maintainers/scripts/azure-new/shell.nix
index 592f1bf9056e5..9bc79cc69d7f8 100644
--- a/nixos/maintainers/scripts/azure-new/shell.nix
+++ b/nixos/maintainers/scripts/azure-new/shell.nix
@@ -1,13 +1,16 @@
-with (import ../../../../default.nix {});
-stdenv.mkDerivation {
+{
+  pkgs ? import ../../../../default.nix { },
+}:
+
+pkgs.stdenv.mkDerivation {
   name = "nixcfg-azure-devenv";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with pkgs; [
     azure-cli
     bash
     cacert
     azure-storage-azcopy
   ];
 
-  AZURE_CONFIG_DIR="/tmp/azure-cli/.azure";
+  AZURE_CONFIG_DIR = "/tmp/azure-cli/.azure";
 }
diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix
index 65e73833a7599..1fb97c16d75f2 100644
--- a/nixos/modules/hardware/ckb-next.nix
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -41,6 +41,6 @@ in
     };
 
     meta = {
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   }
diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
index 120348a74bfbe..873a2db380919 100644
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -40,7 +40,7 @@ let
       homepage = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/";
       license = licenses.unfreeRedistributable;
       platforms = [ "x86_64-linux" ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in {
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 1aa79166dee7e..d09e71422b2e9 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -102,8 +102,8 @@ in
         driver causes it to provide its own framebuffer device, which can cause
         Wayland compositors to work when they otherwise wouldn't.
       '' // {
-        default = lib.versionAtLeast nvidia_x11.version "535";
-        defaultText = lib.literalExpression "lib.versionAtLeast nvidia_x11.version \"535\"";
+        default = lib.versionAtLeast cfg.package.version "535";
+        defaultText = lib.literalExpression "lib.versionAtLeast cfg.package.version \"535\"";
       };
 
       prime.nvidiaBusId = lib.mkOption {
@@ -256,7 +256,9 @@ in
 
       open = lib.mkEnableOption ''
         the open source NVIDIA kernel module
-      '';
+      '' // {
+        defaultText = lib.literalExpression ''lib.versionAtLeast config.hardware.nvidia.package.version "560"'';
+      };
     };
   };
 
@@ -305,6 +307,8 @@ in
             extraPackages32 = [ nvidia_x11.lib32 ];
           };
           environment.systemPackages = [ nvidia_x11.bin ];
+
+          hardware.nvidia.open = lib.mkDefault (lib.versionAtLeast nvidia_x11.version "560");
         })
 
         # X11
@@ -472,7 +476,6 @@ in
 
           hardware.graphics = {
             extraPackages = [ pkgs.nvidia-vaapi-driver ];
-            extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ];
           };
 
           environment.systemPackages =
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 53c314bb05d5d..e48a836a6abd8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -304,6 +304,7 @@
   ./programs/wayland/hyprlock.nix
   ./programs/wayland/hyprland.nix
   ./programs/wayland/labwc.nix
+  ./programs/wayland/miracle-wm.nix
   ./programs/wayland/river.nix
   ./programs/wayland/sway.nix
   ./programs/wayland/waybar.nix
diff --git a/nixos/modules/programs/dmrconfig.nix b/nixos/modules/programs/dmrconfig.nix
index 0078ca19f41a1..e2136765093aa 100644
--- a/nixos/modules/programs/dmrconfig.nix
+++ b/nixos/modules/programs/dmrconfig.nix
@@ -4,7 +4,7 @@ let
   cfg = config.programs.dmrconfig;
 
 in {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   ###### interface
   options = {
diff --git a/nixos/modules/programs/wayland/miracle-wm.nix b/nixos/modules/programs/wayland/miracle-wm.nix
new file mode 100644
index 0000000000000..a4c843523dc40
--- /dev/null
+++ b/nixos/modules/programs/wayland/miracle-wm.nix
@@ -0,0 +1,43 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.programs.wayland.miracle-wm;
+in
+{
+  options.programs.wayland.miracle-wm = {
+    enable = lib.mkEnableOption ''
+      miracle-wm, a tiling Mir based Wayland compositor. You can manually launch miracle-wm by
+      executing "exec miracle-wm" on a TTY, or launch it from a display manager.
+      Consult the USERGUIDE.md at <https://github.com/mattkae/miracle-wm> for information on
+      how to use & configure it
+    '';
+  };
+
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      {
+        environment = {
+          systemPackages = [ pkgs.miracle-wm ];
+        };
+
+        # To make the miracle-wm session available if a display manager like SDDM is enabled:
+        services.displayManager.sessionPackages = [ pkgs.miracle-wm ];
+      }
+
+      (import ./wayland-session.nix {
+        inherit lib pkgs;
+        # Hardcoded path in Mir, not really possible to disable
+        enableXWayland = true;
+        # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164
+        enableWlrPortal = false;
+      })
+    ]
+  );
+
+  meta.maintainers = with lib.maintainers; [ OPNA2608 ];
+}
diff --git a/nixos/modules/programs/wayland/wayfire.nix b/nixos/modules/programs/wayland/wayfire.nix
index 7acc5b2739cbf..1c3950bff47da 100644
--- a/nixos/modules/programs/wayland/wayfire.nix
+++ b/nixos/modules/programs/wayland/wayfire.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.programs.wayfire;
 in
@@ -12,7 +17,10 @@ in
 
     plugins = lib.mkOption {
       type = lib.types.listOf lib.types.package;
-      default = with pkgs.wayfirePlugins; [ wcm wf-shell ];
+      default = with pkgs.wayfirePlugins; [
+        wcm
+        wf-shell
+      ];
       defaultText = lib.literalExpression "with pkgs.wayfirePlugins; [ wcm wf-shell ]";
       example = lib.literalExpression ''
         with pkgs.wayfirePlugins; [
@@ -25,26 +33,39 @@ in
         Additional plugins to use with the wayfire window manager.
       '';
     };
+    xwayland.enable = lib.mkEnableOption "XWayland" // {
+      default = true;
+    };
   };
 
-  config = let
-    finalPackage = pkgs.wayfire-with-plugins.override {
-      wayfire = cfg.package;
-      plugins = cfg.plugins;
-    };
-  in
-  lib.mkIf cfg.enable {
-    environment.systemPackages = [
-      finalPackage
-    ];
+  config =
+    let
+      finalPackage = pkgs.wayfire-with-plugins.override {
+        wayfire = cfg.package;
+        plugins = cfg.plugins;
+      };
+    in
+    lib.mkIf cfg.enable (
+      lib.mkMerge [
+        {
+          environment.systemPackages = [ finalPackage ];
 
-    services.displayManager.sessionPackages = [ finalPackage ];
+          services.displayManager.sessionPackages = [ finalPackage ];
 
-    xdg.portal = {
-      enable = lib.mkDefault true;
-      wlr.enable = lib.mkDefault true;
-      # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050914
-      config.wayfire.default = lib.mkDefault [ "wlr" "gtk" ];
-    };
-  };
+          xdg.portal = {
+            enable = lib.mkDefault true;
+            wlr.enable = lib.mkDefault true;
+            # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050914
+            config.wayfire.default = lib.mkDefault [
+              "wlr"
+              "gtk"
+            ];
+          };
+        }
+        (import ./wayland-session.nix {
+          inherit lib pkgs;
+          enableXWayland = cfg.xwayland.enable;
+        })
+      ]
+    );
 }
diff --git a/nixos/modules/services/audio/jmusicbot.nix b/nixos/modules/services/audio/jmusicbot.nix
index 5507f4859058f..d1317facf273f 100644
--- a/nixos/modules/services/audio/jmusicbot.nix
+++ b/nixos/modules/services/audio/jmusicbot.nix
@@ -40,5 +40,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 00381be4b75d3..e3fa7f45844f1 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -20,7 +20,7 @@ let
   '';
   backupDatabaseScript = db: ''
     dest="${cfg.location}/${db}.gz"
-    if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
+    if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c ${cfg.gzipOptions} > $dest.tmp; then
       mv $dest.tmp $dest
       echo "Backed up to $dest"
     else
@@ -78,6 +78,14 @@ in
           Whether to create database dump in a single transaction
         '';
       };
+
+      gzipOptions = mkOption {
+        default = "--no-name --rsyncable";
+        type = types.str;
+        description = ''
+          Command line options to use when invoking `gzip`.
+        '';
+      };
     };
 
   };
diff --git a/nixos/modules/services/hardware/openrgb.nix b/nixos/modules/services/hardware/openrgb.nix
index 1f7e4ffb9265a..4dc521aa97800 100644
--- a/nixos/modules/services/hardware/openrgb.nix
+++ b/nixos/modules/services/hardware/openrgb.nix
@@ -51,5 +51,5 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
index d2dda2636ef1b..10dced2c4e64b 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -41,5 +41,5 @@ in {
 
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix
index ec08ab51a4574..8f4869ce5d559 100644
--- a/nixos/modules/services/misc/gitweb.nix
+++ b/nixos/modules/services/misc/gitweb.nix
@@ -55,6 +55,6 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 
 }
diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix
index 6c7f08d48be10..38b4dd290ed56 100644
--- a/nixos/modules/services/misc/mame.nix
+++ b/nixos/modules/services/misc/mame.nix
@@ -65,5 +65,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/misc/private-gpt.nix b/nixos/modules/services/misc/private-gpt.nix
index ad9b6f5ffa80f..7bd2e492f5b56 100644
--- a/nixos/modules/services/misc/private-gpt.nix
+++ b/nixos/modules/services/misc/private-gpt.nix
@@ -117,5 +117,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/misc/rkvm.nix b/nixos/modules/services/misc/rkvm.nix
index b149c3d3979f5..ac747253635e8 100644
--- a/nixos/modules/services/misc/rkvm.nix
+++ b/nixos/modules/services/misc/rkvm.nix
@@ -7,7 +7,7 @@ let
   toml = pkgs.formats.toml { };
 in
 {
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 
   options.services.rkvm = {
     enable = mkOption {
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 8db63d5386332..3167be0bbd462 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -372,5 +372,5 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/networking/bee.nix b/nixos/modules/services/networking/bee.nix
index 72483c41d02d1..83ce522ba62af 100644
--- a/nixos/modules/services/networking/bee.nix
+++ b/nixos/modules/services/networking/bee.nix
@@ -8,7 +8,7 @@ let
 in {
   meta = {
     # doc = ./bee.xml;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 
   ### interface
diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
index f4456f4d99c8b..d26e26d0c1950 100644
--- a/nixos/modules/services/networking/eternal-terminal.nix
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -90,6 +90,6 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix
index 674a424fb0a42..2f706c3bc3f98 100644
--- a/nixos/modules/services/networking/firefox-syncserver.nix
+++ b/nixos/modules/services/networking/firefox-syncserver.nix
@@ -316,7 +316,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     doc = ./firefox-syncserver.md;
   };
 }
diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index 00d276bcdf60a..0d0e2c340ebf1 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -141,5 +141,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index aa059b1b7c90a..2bb9df15de2c3 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -183,37 +183,45 @@ let
   in
     pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts);
 
-  tunnelConf = let opts = [
-    notice
-    (flip map
-      (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
-      (tun: let outTunOpts = [
-        (sec tun.name)
-        "type = client"
-        (intOpt "port" tun.port)
-        (strOpt "destination" tun.destination)
+  tunnelConf = let
+    mkOutTunnel = tun:
+      let
+        outTunOpts = [
+          (sec tun.name)
+          "type = client"
+          (intOpt "port" tun.port)
+          (strOpt "destination" tun.destination)
         ] ++ (optionals (tun ? destinationPort) (optionalNullInt "destinationport" tun.destinationPort))
-        ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
-        ++ (optionals (tun ? address) (optionalNullString "address" tun.address))
-        ++ (optionals (tun ? inbound.length) (optionalNullInt "inbound.length" tun.inbound.length))
-        ++ (optionals (tun ? inbound.quantity) (optionalNullInt "inbound.quantity" tun.inbound.quantity))
-        ++ (optionals (tun ? outbound.length) (optionalNullInt "outbound.length" tun.outbound.length))
-        ++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity))
-        ++ (optionals (tun ? crypto.tagsToSend) (optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend));
-        in concatStringsSep "\n" outTunOpts))
-    (flip map
-      (collect (tun: tun ? port && tun ? address) cfg.inTunnels)
-      (tun: let inTunOpts = [
-        (sec tun.name)
-        "type = server"
-        (intOpt "port" tun.port)
-        (strOpt "host" tun.address)
-      ] ++ (optionals (tun ? destination) (optionalNullString "destination" tun.destination))
-        ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
-        ++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort))
-        ++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList));
-        in concatStringsSep "\n" inTunOpts))];
-    in pkgs.writeText "i2pd-tunnels.conf" opts;
+          ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
+          ++ (optionals (tun ? address) (optionalNullString "address" tun.address))
+          ++ (optionals (tun ? inbound.length) (optionalNullInt "inbound.length" tun.inbound.length))
+          ++ (optionals (tun ? inbound.quantity) (optionalNullInt "inbound.quantity" tun.inbound.quantity))
+          ++ (optionals (tun ? outbound.length) (optionalNullInt "outbound.length" tun.outbound.length))
+          ++ (optionals (tun ? outbound.quantity) (optionalNullInt "outbound.quantity" tun.outbound.quantity))
+          ++ (optionals (tun ? crypto.tagsToSend) (optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend));
+      in
+        concatStringsSep "\n" outTunOpts;
+
+    mkInTunnel = tun:
+      let
+        inTunOpts = [
+          (sec tun.name)
+          "type = server"
+          (intOpt "port" tun.port)
+          (strOpt "host" tun.address)
+        ] ++ (optionals (tun ? destination) (optionalNullString "destination" tun.destination))
+          ++ (optionals (tun ? keys) (optionalNullString "keys" tun.keys))
+          ++ (optionals (tun ? inPort) (optionalNullInt "inport" tun.inPort))
+          ++ (optionals (tun ? accessList) (optionalEmptyList "accesslist" tun.accessList));
+      in
+        concatStringsSep "\n" inTunOpts;
+
+    allOutTunnels = collect (tun: tun ? port && tun ? destination) cfg.outTunnels;
+    allInTunnels = collect (tun: tun ? port && tun ? address) cfg.inTunnels;
+
+    opts = [ notice ] ++ (map mkOutTunnel allOutTunnels) ++ (map mkInTunnel allInTunnels);
+  in
+    pkgs.writeText "i2pd-tunnels.conf" (concatStringsSep "\n" opts);
 
   i2pdFlags = concatStringsSep " " (
     optional (cfg.address != null) ("--host=" + cfg.address) ++ [
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 7baaf93a1bcfa..1137c61df9a09 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -721,7 +721,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     doc = ./mosquitto.md;
   };
 }
diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix
index 8310b119b5f67..3642a4b15a661 100644
--- a/nixos/modules/services/networking/pppd.nix
+++ b/nixos/modules/services/networking/pppd.nix
@@ -7,7 +7,7 @@ let
 in
 {
   meta = {
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 
   options = {
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index c788069fbaa55..02773d78b1328 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -291,5 +291,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index e29267e50003b..a2cf9611d677b 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -54,5 +54,5 @@ in {
 
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix
index c6d260b902670..0a85173501d5f 100644
--- a/nixos/modules/services/security/shibboleth-sp.nix
+++ b/nixos/modules/services/security/shibboleth-sp.nix
@@ -70,5 +70,5 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix
index 43bc402e7818b..70651e995dda1 100644
--- a/nixos/modules/services/security/step-ca.nix
+++ b/nixos/modules/services/security/step-ca.nix
@@ -4,7 +4,7 @@ let
   settingsFormat = (pkgs.formats.json { });
 in
 {
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   options = {
     services.step-ca = {
diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix
index 9242c1adbde16..81f794bf9b3f8 100644
--- a/nixos/modules/services/web-servers/nginx/gitweb.nix
+++ b/nixos/modules/services/web-servers/nginx/gitweb.nix
@@ -89,6 +89,6 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 
 }
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 96cc6215118cd..f6392be29437e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -264,6 +264,7 @@ in {
   docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {};
   docker-registry = handleTest ./docker-registry.nix {};
   docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};
+  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
   docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};
   docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};
   documize = handleTest ./documize.nix {};
@@ -578,6 +579,7 @@ in {
   minidlna = handleTest ./minidlna.nix {};
   miniflux = handleTest ./miniflux.nix {};
   minio = handleTest ./minio.nix {};
+  miracle-wm = runTest ./miracle-wm.nix;
   miriway = handleTest ./miriway.nix {};
   misc = handleTest ./misc.nix {};
   mjolnir = handleTest ./matrix/mjolnir.nix {};
diff --git a/nixos/tests/crabfit.nix b/nixos/tests/crabfit.nix
index 0daf47d52f25d..eb38a0ae0cfcd 100644
--- a/nixos/tests/crabfit.nix
+++ b/nixos/tests/crabfit.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
   {
     name = "crabfit";
 
-    meta.maintainers = with lib.maintainers; [ ];
+    meta.maintainers = [ ];
 
     nodes = {
       machine =
diff --git a/nixos/tests/docker-tools-nix-shell.nix b/nixos/tests/docker-tools-nix-shell.nix
new file mode 100644
index 0000000000000..c2ae2124e0a18
--- /dev/null
+++ b/nixos/tests/docker-tools-nix-shell.nix
@@ -0,0 +1,95 @@
+# nix-build -A nixosTests.docker-tools-nix-shell
+{ config, lib, ... }:
+let
+  inherit (config.node.pkgs.dockerTools) examples;
+in
+{
+  name = "docker-tools-nix-shell";
+  meta = with lib.maintainers; {
+    maintainers = [
+      infinisil
+      roberth
+    ];
+  };
+
+  nodes = {
+    docker =
+      { ... }:
+      {
+        virtualisation = {
+          diskSize = 3072;
+          docker.enable = true;
+        };
+      };
+  };
+
+  testScript = ''
+    docker.wait_for_unit("sockets.target")
+
+    with subtest("buildImageWithNixDB: Has a nix database"):
+        docker.succeed(
+            "docker load --input='${examples.nix}'",
+            "docker run --rm ${examples.nix.imageName} nix-store -q --references /bin/bash"
+        )
+
+    with subtest("buildNixShellImage: Can build a basic derivation"):
+        docker.succeed(
+            "${examples.nix-shell-basic} | docker load",
+            "docker run --rm nix-shell-basic bash -c 'buildDerivation && $out/bin/hello' | grep '^Hello, world!$'"
+        )
+
+    with subtest("buildNixShellImage: Runs the shell hook"):
+        docker.succeed(
+            "${examples.nix-shell-hook} | docker load",
+            "docker run --rm -it nix-shell-hook | grep 'This is the shell hook!'"
+        )
+
+    with subtest("buildNixShellImage: Sources stdenv, making build inputs available"):
+        docker.succeed(
+            "${examples.nix-shell-inputs} | docker load",
+            "docker run --rm -it nix-shell-inputs | grep 'Hello, world!'"
+        )
+
+    with subtest("buildNixShellImage: passAsFile works"):
+        docker.succeed(
+            "${examples.nix-shell-pass-as-file} | docker load",
+            "docker run --rm -it nix-shell-pass-as-file | grep 'this is a string'"
+        )
+
+    with subtest("buildNixShellImage: run argument works"):
+        docker.succeed(
+            "${examples.nix-shell-run} | docker load",
+            "docker run --rm -it nix-shell-run | grep 'This shell is not interactive'"
+        )
+
+    with subtest("buildNixShellImage: command argument works"):
+        docker.succeed(
+            "${examples.nix-shell-command} | docker load",
+            "docker run --rm -it nix-shell-command | grep 'This shell is interactive'"
+        )
+
+    with subtest("buildNixShellImage: home directory is writable by default"):
+        docker.succeed(
+            "${examples.nix-shell-writable-home} | docker load",
+            "docker run --rm -it nix-shell-writable-home"
+        )
+
+    with subtest("buildNixShellImage: home directory can be made non-existent"):
+        docker.succeed(
+            "${examples.nix-shell-nonexistent-home} | docker load",
+            "docker run --rm -it nix-shell-nonexistent-home"
+        )
+
+    with subtest("buildNixShellImage: can build derivations"):
+        docker.succeed(
+            "${examples.nix-shell-build-derivation} | docker load",
+            "docker run --rm -it nix-shell-build-derivation"
+        )
+
+    with subtest("streamLayeredImage: with nix db"):
+        docker.succeed(
+            "${examples.nix-layered} | docker load",
+            "docker run --rm ${examples.nix-layered.imageName} nix-store -q --references /bin/bash"
+        )
+  '';
+}
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 8c315ee731ea2..41bd4a621545f 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -60,7 +60,7 @@ let
     };
 
   nonRootTestImage =
-    pkgs.dockerTools.streamLayeredImage rec {
+    pkgs.dockerTools.streamLayeredImage {
       name = "non-root-test";
       tag = "latest";
       uid = 1000;
@@ -567,66 +567,6 @@ in {
         docker.succeed("docker run --rm image-with-certs:latest test -r /etc/pki/tls/certs/ca-bundle.crt")
         docker.succeed("docker image rm image-with-certs:latest")
 
-    with subtest("buildImageWithNixDB: Has a nix database"):
-        docker.succeed(
-            "docker load --input='${examples.nix}'",
-            "docker run --rm ${examples.nix.imageName} nix-store -q --references /bin/bash"
-        )
-
-    with subtest("buildNixShellImage: Can build a basic derivation"):
-        docker.succeed(
-            "${examples.nix-shell-basic} | docker load",
-            "docker run --rm nix-shell-basic bash -c 'buildDerivation && $out/bin/hello' | grep '^Hello, world!$'"
-        )
-
-    with subtest("buildNixShellImage: Runs the shell hook"):
-        docker.succeed(
-            "${examples.nix-shell-hook} | docker load",
-            "docker run --rm -it nix-shell-hook | grep 'This is the shell hook!'"
-        )
-
-    with subtest("buildNixShellImage: Sources stdenv, making build inputs available"):
-        docker.succeed(
-            "${examples.nix-shell-inputs} | docker load",
-            "docker run --rm -it nix-shell-inputs | grep 'Hello, world!'"
-        )
-
-    with subtest("buildNixShellImage: passAsFile works"):
-        docker.succeed(
-            "${examples.nix-shell-pass-as-file} | docker load",
-            "docker run --rm -it nix-shell-pass-as-file | grep 'this is a string'"
-        )
-
-    with subtest("buildNixShellImage: run argument works"):
-        docker.succeed(
-            "${examples.nix-shell-run} | docker load",
-            "docker run --rm -it nix-shell-run | grep 'This shell is not interactive'"
-        )
-
-    with subtest("buildNixShellImage: command argument works"):
-        docker.succeed(
-            "${examples.nix-shell-command} | docker load",
-            "docker run --rm -it nix-shell-command | grep 'This shell is interactive'"
-        )
-
-    with subtest("buildNixShellImage: home directory is writable by default"):
-        docker.succeed(
-            "${examples.nix-shell-writable-home} | docker load",
-            "docker run --rm -it nix-shell-writable-home"
-        )
-
-    with subtest("buildNixShellImage: home directory can be made non-existent"):
-        docker.succeed(
-            "${examples.nix-shell-nonexistent-home} | docker load",
-            "docker run --rm -it nix-shell-nonexistent-home"
-        )
-
-    with subtest("buildNixShellImage: can build derivations"):
-        docker.succeed(
-            "${examples.nix-shell-build-derivation} | docker load",
-            "docker run --rm -it nix-shell-build-derivation"
-        )
-
     with subtest("streamLayeredImage: chown is persistent in fakeRootCommands"):
         docker.succeed(
             "${chownTestImage} | docker load",
@@ -638,11 +578,5 @@ in {
             "${nonRootTestImage} | docker load",
             "docker run --rm ${chownTestImage.imageName} | diff /dev/stdin <(echo 12345:12345)"
         )
-
-    with subtest("streamLayeredImage: with nix db"):
-        docker.succeed(
-            "${examples.nix-layered} | docker load",
-            "docker run --rm ${examples.nix-layered.imageName} nix-store -q --references /bin/bash"
-        )
   '';
 })
diff --git a/nixos/tests/graylog.nix b/nixos/tests/graylog.nix
index 9d19dcf028eb5..b52c2976a73f8 100644
--- a/nixos/tests/graylog.nix
+++ b/nixos/tests/graylog.nix
@@ -1,6 +1,6 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "graylog";
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   nodes.machine = { pkgs, ... }: {
     virtualisation.memorySize = 4096;
diff --git a/nixos/tests/miracle-wm.nix b/nixos/tests/miracle-wm.nix
new file mode 100644
index 0000000000000..2bb62222b22a1
--- /dev/null
+++ b/nixos/tests/miracle-wm.nix
@@ -0,0 +1,131 @@
+{ pkgs, lib, ... }:
+{
+  name = "miracle-wm";
+
+  meta = {
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+  };
+
+  nodes.machine =
+    { config, ... }:
+    {
+      imports = [
+        ./common/auto.nix
+        ./common/user-account.nix
+      ];
+
+      # Seems to very rarely get interrupted by oom-killer
+      virtualisation.memorySize = 2047;
+
+      test-support.displayManager.auto = {
+        enable = true;
+        user = "alice";
+      };
+
+      services.xserver.enable = true;
+      services.displayManager.defaultSession = lib.mkForce "miracle-wm";
+
+      programs.wayland.miracle-wm.enable = true;
+
+      # To ensure a specific config for the tests
+      systemd.tmpfiles.rules =
+        let
+          testConfig = (pkgs.formats.yaml { }).generate "miracle-wm.yaml" {
+            terminal = "env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty";
+            startup_apps = [
+              {
+                command = "foot";
+                restart_on_death = false;
+              }
+            ];
+          };
+        in
+        [
+          "d ${config.users.users.alice.home}/.config 0700 alice users - -"
+          "L ${config.users.users.alice.home}/.config/miracle-wm.yaml - - - - ${testConfig}"
+        ];
+
+      environment = {
+        shellAliases = {
+          test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
+          test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
+        };
+
+        systemPackages = with pkgs; [
+          mesa-demos
+          wayland-utils
+          foot
+          alacritty
+        ];
+
+        # To help with OCR
+        etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
+          main = {
+            font = "inconsolata:size=16";
+          };
+          colors = rec {
+            foreground = "000000";
+            background = "ffffff";
+            regular2 = foreground;
+          };
+        };
+        etc."xdg/alacritty/alacritty.yml".text = lib.generators.toYAML { } {
+          font = rec {
+            normal.family = "Inconsolata";
+            bold.family = normal.family;
+            italic.family = normal.family;
+            bold_italic.family = normal.family;
+            size = 16;
+          };
+          colors = rec {
+            primary = {
+              foreground = "0x000000";
+              background = "0xffffff";
+            };
+            normal = {
+              green = primary.foreground;
+            };
+          };
+        };
+      };
+
+      fonts.packages = [ pkgs.inconsolata ];
+    };
+
+  enableOCR = true;
+
+  testScript =
+    { ... }:
+    ''
+      start_all()
+      machine.wait_for_unit("multi-user.target")
+
+      # Wait for Miriway to complete startup
+      machine.wait_for_file("/run/user/1000/wayland-0")
+      machine.succeed("pgrep miracle-wm")
+      machine.screenshot("miracle-wm_launched")
+
+      # Test Wayland
+      with subtest("wayland client works"):
+          # We let miracle-wm start the first terminal, as we might get stuck if it's not ready to process the first keybind
+          # machine.send_key("ctrl-alt-t")
+          machine.wait_for_text("alice@machine")
+          machine.send_chars("test-wayland\n")
+          machine.wait_for_file("/tmp/test-wayland-exit-ok")
+          machine.copy_from_vm("/tmp/test-wayland.out")
+          machine.screenshot("foot_wayland_info")
+          machine.send_chars("exit\n")
+          machine.wait_until_fails("pgrep foot")
+
+      # Test XWayland
+      with subtest("x11 client works"):
+          machine.send_key("meta_l-ret")
+          machine.wait_for_text("alice@machine")
+          machine.send_chars("test-x11\n")
+          machine.wait_for_file("/tmp/test-x11-exit-ok")
+          machine.copy_from_vm("/tmp/test-x11.out")
+          machine.screenshot("alacritty_glinfo")
+          machine.send_chars("exit\n")
+          machine.wait_until_fails("pgrep alacritty")
+    '';
+}
diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix
index c8c44f9320d40..bd989408df8a1 100644
--- a/nixos/tests/networking/networkmanager.nix
+++ b/nixos/tests/networking/networkmanager.nix
@@ -166,7 +166,7 @@ let
 in lib.mapAttrs (lib.const (attrs: makeTest (attrs // {
   name = "${attrs.name}-Networking-NetworkManager";
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
 }))) testCases
diff --git a/nixos/tests/soju.nix b/nixos/tests/soju.nix
index 32d1daf43d1a3..f13c447fb5f6b 100644
--- a/nixos/tests/soju.nix
+++ b/nixos/tests/soju.nix
@@ -8,7 +8,7 @@ let
 in
 {
   name = "soju";
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   nodes.machine = { ... }: {
     services.soju = {
diff --git a/nixos/tests/vector/syslog-quickwit.nix b/nixos/tests/vector/syslog-quickwit.nix
index 89c46d42ee75c..cb6e04e00eae4 100644
--- a/nixos/tests/vector/syslog-quickwit.nix
+++ b/nixos/tests/vector/syslog-quickwit.nix
@@ -61,6 +61,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }:
                 }
                 .scope_name = structured.msgid
                 del(.message)
+                del(.host)
                 del(.timestamp)
                 del(.service)
                 del(.source_type)
diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix
index 6b5294e154204..2b2630ef87d2f 100644
--- a/nixos/tests/vscode-remote-ssh.nix
+++ b/nixos/tests/vscode-remote-ssh.nix
@@ -14,7 +14,7 @@ import ./make-test-python.nix ({ lib, ... }@args: let
   inherit (pkgs.vscode.passthru) rev vscodeServer;
 in {
   name = "vscode-remote-ssh";
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 
   nodes = let
     serverAddress = "192.168.0.2";
diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix
index 475ecd26e706a..8318a4936ed94 100644
--- a/pkgs/applications/audio/ashuffle/default.nix
+++ b/pkgs/applications/audio/ashuffle/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ashuffle";
-  version = "3.14.7";
+  version = "3.14.8";
 
   src = fetchFromGitHub {
     owner = "joshkunz";
     repo = "ashuffle";
     rev = "v${version}";
-    hash = "sha256-id55Ss/7PLBPn55RikAlqr3VkNzgm8NiL/ruFGAmH30=";
+    hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix
index 6127cb7e69291..ef0560fdc2ad1 100644
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.jpj.net/~trevor/aumix.html";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix
index 357560b178bb9..1f33323736cef 100644
--- a/pkgs/applications/audio/in-formant/default.nix
+++ b/pkgs/applications/audio/in-formant/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     # currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix
index a03fc7aed242b..7f4d7275959ca 100644
--- a/pkgs/applications/audio/jmusicbot/default.nix
+++ b/pkgs/applications/audio/jmusicbot/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jagrosh/MusicBot";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (jre_headless.meta) platforms;
     mainProgram = "JMusicBot";
   };
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index abe8ac01cce21..7cc6bb62275a4 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Tracker music player for the terminal";
     homepage = "http://mikmod.shlomifish.org/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "mikmod";
   };
diff --git a/pkgs/applications/audio/mopidy/muse.nix b/pkgs/applications/audio/mopidy/muse.nix
index 5b33771ff3f11..f98d1ca458fe2 100644
--- a/pkgs/applications/audio/mopidy/muse.nix
+++ b/pkgs/applications/audio/mopidy/muse.nix
@@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec {
     description = "Mopidy web client with Snapcast support";
     homepage = "https://github.com/cristianpb/muse";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index 902d209f0286a..105fcff2accdd 100644
--- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix
@@ -26,6 +26,6 @@ pythonPackages.buildPythonApplication rec {
     homepage = "https://github.com/pimusicbox/mopidy-musicbox-webclient";
     changelog = "https://github.com/pimusicbox/mopidy-musicbox-webclient/blob/v${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix
index aeeedb23a03ae..f52ed61911135 100644
--- a/pkgs/applications/audio/mopidy/notify.nix
+++ b/pkgs/applications/audio/mopidy/notify.nix
@@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec {
     homepage = "https://github.com/phijor/mopidy-notify";
     description = "Mopidy extension for showing desktop notifications on track change";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix
index 537baa3de020e..b306ae91f17c2 100644
--- a/pkgs/applications/audio/mopidy/tunein.nix
+++ b/pkgs/applications/audio/mopidy/tunein.nix
@@ -20,6 +20,6 @@ python3Packages.buildPythonApplication rec {
     description = "Mopidy extension for playing music from tunein";
     homepage = "https://github.com/kingosticks/mopidy-tunein";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix
index 33cf382ada887..cd57667b427c0 100644
--- a/pkgs/applications/audio/mopidy/youtube.nix
+++ b/pkgs/applications/audio/mopidy/youtube.nix
@@ -67,6 +67,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "Mopidy extension for playing music from YouTube";
     homepage = "https://github.com/natumbri/mopidy-youtube";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix
index c188465f52e99..504351a1a41fc 100644
--- a/pkgs/applications/audio/open-stage-control/default.nix
+++ b/pkgs/applications/audio/open-stage-control/default.nix
@@ -88,7 +88,7 @@ buildNpmPackage rec {
     description = "Libre and modular OSC / MIDI controller";
     homepage = "https://openstagecontrol.ammd.net/";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "open-stage-control";
   };
diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix
index 289991a944316..2be3275935f05 100644
--- a/pkgs/applications/audio/openutau/default.nix
+++ b/pkgs/applications/audio/openutau/default.nix
@@ -83,7 +83,7 @@ buildDotnetModule rec {
       # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT
       unfreeRedistributable
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
     mainProgram = "OpenUtau";
   };
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 6c602ef1d03ed..53233995ac100 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     description = "Tools to work with opus encoded audio streams";
     homepage = "https://www.opus-codec.org/";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index f6b8d20f91d2c..027d3880bd9d1 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -1,56 +1,72 @@
-{ fetchurl
-, lib
-, stdenv
-, pkg-config
-, intltool
-, libpulseaudio
-, gtkmm3
-, libsigcxx
-, libcanberra-gtk3
-, json-glib
-, adwaita-icon-theme
-, wrapGAppsHook3
+{
+  fetchFromGitLab,
+  lib,
+  stdenv,
+  pkg-config,
+  intltool,
+  libpulseaudio,
+  gtkmm4,
+  libsigcxx,
+  # Since version 6.0, libcanberra is optional
+  withLibcanberra ? true,
+  libcanberra-gtk3,
+  json-glib,
+  adwaita-icon-theme,
+  wrapGAppsHook4,
+  meson,
+  ninja,
+  libpressureaudio,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pavucontrol";
-  version = "5.0";
+  version = "6.0";
 
-  src = fetchurl {
-    url = "https://freedesktop.org/software/pulseaudio/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-zityw7XxpwrQ3xndgXUPlFW9IIcNHTo20gU2ry6PTno=";
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "pulseaudio";
+    repo = "pavucontrol";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-nxzFvD/KUevIJOw9jgcr0Hfvg7KiSOmTBfKN3jLu3Cg=";
   };
 
   buildInputs = [
     libpulseaudio
-    gtkmm3
+    gtkmm4
     libsigcxx
-    libcanberra-gtk3
+    (lib.optionals withLibcanberra libcanberra-gtk3)
     json-glib
     adwaita-icon-theme
+    libpressureaudio
   ];
 
-  nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    pkg-config
+    intltool
+    wrapGAppsHook4
+    meson
+    ninja
+  ];
 
-  configureFlags = [ "--disable-lynx" ];
+  mesonFlags = [
+    "--prefix=${placeholder "out"}"
+    (lib.mesonBool "lynx" false)
+  ];
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://freedesktop.org/software/pulseaudio/pavucontrol/#news";
     description = "PulseAudio Volume Control";
-
+    homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/";
+    license = lib.licenses.gpl2Plus;
     longDescription = ''
       PulseAudio Volume Control (pavucontrol) provides a GTK
       graphical user interface to connect to a PulseAudio server and
       easily control the volume of all clients, sinks, etc.
     '';
-
-    homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/";
-
-    license = lib.licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
     mainProgram = "pavucontrol";
+    maintainers = with lib.maintainers; [ abbradar ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix
index 29215aa061952..f2e2310bd4c47 100644
--- a/pkgs/applications/audio/pmidi/default.nix
+++ b/pkgs/applications/audio/pmidi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "https://www.parabola.me.uk/alsa/pmidi.html";
     description = "Straightforward command line program to play midi files through the ALSA sequencer";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2;
     mainProgram = "pmidi";
   };
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 6ca8d55bb249c..f7ca3d37793b6 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -56,7 +56,7 @@ mkDerivation rec {
     description = "Cross-platform Milkdrop-compatible music visualizer";
     license = lib.licenses.lgpl21;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     longDescription = ''
       The open-source project that reimplements the esteemed Winamp Milkdrop by Geiss in a more modern, cross-platform reusable library.
       Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations.
diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix
index 744b5f0cd4ce6..6daaf094b3341 100644
--- a/pkgs/applications/audio/pulseeffects-legacy/default.nix
+++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix
@@ -104,7 +104,7 @@ in stdenv.mkDerivation rec {
     mainProgram = "pulseeffects";
     homepage = "https://github.com/wwmm/pulseeffects";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/applications/audio/pwvucontrol/Cargo.lock
index c07b91890643e..d3df103deeca7 100644
--- a/pkgs/applications/audio/pwvucontrol/Cargo.lock
+++ b/pkgs/applications/audio/pwvucontrol/Cargo.lock
@@ -4,56 +4,61 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "annotate-snippets"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+dependencies = [
+ "unicode-width",
+ "yansi-term",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.77"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bindgen"
-version = "0.66.1"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.4.1",
+ "annotate-snippets",
+ "bitflags",
  "cexpr",
  "clang-sys",
+ "itertools",
  "lazy_static",
  "lazycell",
- "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.43",
+ "syn",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bitmaps"
@@ -69,23 +74,22 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "cairo-rs"
-version = "0.18.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1"
+checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags",
  "cairo-sys-rs",
  "glib",
  "libc",
- "once_cell",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.18.2"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
+checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64"
 dependencies = [
  "glib-sys",
  "libc",
@@ -94,12 +98,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "2755ff20a1d93490d26ba33a6f092a38a508398a5320df5d4b3014fcccce9410"
 
 [[package]]
 name = "cexpr"
@@ -112,9 +113,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.5"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -128,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clang-sys"
-version = "1.6.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -148,9 +149,18 @@ dependencies = [
 
 [[package]]
 name = "cookie-factory"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b"
+checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
+dependencies = [
+ "futures",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "equivalent"
@@ -164,7 +174,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset 0.9.0",
+ "memoffset",
  "rustc_version",
 ]
 
@@ -224,7 +234,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn",
 ]
 
 [[package]]
@@ -259,22 +269,21 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.18.3"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c"
+checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699"
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
  "glib",
  "libc",
- "once_cell",
 ]
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.18.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
+checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -285,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6"
+checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
 dependencies = [
  "cairo-rs",
  "gdk-pixbuf",
@@ -300,9 +309,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-sys"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0"
+checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -337,9 +346,9 @@ dependencies = [
 
 [[package]]
 name = "gio"
-version = "0.18.4"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
+checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -348,7 +357,6 @@ dependencies = [
  "gio-sys",
  "glib",
  "libc",
- "once_cell",
  "pin-project-lite",
  "smallvec",
  "thiserror",
@@ -356,24 +364,24 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.18.1"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
+checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
  "system-deps",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
 name = "glib"
-version = "0.18.4"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e"
+checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -386,30 +394,28 @@ dependencies = [
  "libc",
  "log",
  "memchr",
- "once_cell",
  "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "glib-macros"
-version = "0.18.3"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5"
+checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7"
 dependencies = [
  "heck",
- "proc-macro-crate 2.0.1",
- "proc-macro-error",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn",
 ]
 
 [[package]]
 name = "glib-sys"
-version = "0.18.1"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
+checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5"
 dependencies = [
  "libc",
  "system-deps",
@@ -423,9 +429,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "gobject-sys"
-version = "0.18.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
+checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e"
 dependencies = [
  "glib-sys",
  "libc",
@@ -434,9 +440,9 @@ dependencies = [
 
 [[package]]
 name = "graphene-rs"
-version = "0.18.1"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401"
+checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf"
 dependencies = [
  "glib",
  "graphene-sys",
@@ -445,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "graphene-sys"
-version = "0.18.1"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59"
+checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05"
 dependencies = [
  "glib-sys",
  "libc",
@@ -457,9 +463,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e"
+checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
 dependencies = [
  "cairo-rs",
  "gdk4",
@@ -472,9 +478,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55"
+checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -488,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842"
+checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
 dependencies = [
  "cairo-rs",
  "field-offset",
@@ -509,23 +515,21 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.7.2"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f"
+checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
 dependencies = [
- "anyhow",
- "proc-macro-crate 1.3.1",
- "proc-macro-error",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "gtk4-sys"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8"
+checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -542,15 +546,15 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "imbl"
@@ -576,19 +580,28 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -598,9 +611,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libadwaita"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c"
+checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9"
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
@@ -614,9 +627,9 @@ dependencies = [
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a"
+checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8"
 dependencies = [
  "gdk4-sys",
  "gio-sys",
@@ -630,27 +643,27 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets",
 ]
 
 [[package]]
 name = "libspa"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434617020ddca18b86067912970c55410ca654cdafd775480322f50b857a8c4"
+checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags",
  "cc",
  "convert_case",
  "cookie-factory",
@@ -663,9 +676,9 @@ dependencies = [
 
 [[package]]
 name = "libspa-sys"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e70ca3f3e70f858ef363046d06178c427b4e0b63d210c95fd87d752679d345"
+checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
 dependencies = [
  "bindgen",
  "cc",
@@ -687,9 +700,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "malloc_buf"
@@ -702,24 +715,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
@@ -732,15 +736,13 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "nix"
-version = "0.26.4"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "cfg-if",
  "libc",
- "memoffset 0.7.1",
- "pin-utils",
 ]
 
 [[package]]
@@ -790,22 +792,21 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "pango"
-version = "0.18.3"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
+checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd"
 dependencies = [
  "gio",
  "glib",
  "libc",
- "once_cell",
  "pango-sys",
 ]
 
 [[package]]
 name = "pango-sys"
-version = "0.18.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
+checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -813,17 +814,11 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -833,12 +828,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pipewire"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d009c8dd65e890b515a71950f7e4c801523b8894ff33863a40830bf762e9e9"
+checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
 dependencies = [
  "anyhow",
- "bitflags 2.4.1",
+ "bitflags",
  "libc",
  "libspa",
  "libspa-sys",
@@ -850,9 +845,9 @@ dependencies = [
 
 [[package]]
 name = "pipewire-sys"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "890c084e7b737246cb4799c86b71a0e4da536031ff7473dd639eba9f95039f64"
+checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
 dependencies = [
  "bindgen",
  "libspa-sys",
@@ -861,66 +856,31 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
-dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pwvucontrol"
-version = "0.1.0"
+version = "0.4.5"
 dependencies = [
  "anyhow",
  "futures",
@@ -930,16 +890,15 @@ dependencies = [
  "imbl",
  "libadwaita",
  "log",
- "once_cell",
  "pipewire",
  "wireplumber",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -961,9 +920,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -973,9 +932,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -984,9 +943,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "rustc-hash"
@@ -1005,44 +964,44 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "shlex"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "slab"
@@ -1055,26 +1014,15 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.43"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1083,9 +1031,9 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "6.2.0"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
  "cfg-expr",
  "heck",
@@ -1096,79 +1044,79 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.12"
+version = "0.12.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "temp-dir"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6"
+checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
 
 [[package]]
 name = "thiserror"
-version = "1.0.52"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.52"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.2"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -1179,15 +1127,21 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "version-compare"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
@@ -1217,11 +1171,93 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winnow"
-version = "0.5.31"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
 dependencies = [
  "memchr",
 ]
@@ -1229,9 +1265,9 @@ dependencies = [
 [[package]]
 name = "wireplumber"
 version = "0.1.0"
-source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=2c0ee463d029d3562ee66db90554c5af573565c1#2c0ee463d029d3562ee66db90554c5af573565c1"
+source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags",
  "gio",
  "glib",
  "libc",
@@ -1245,7 +1281,7 @@ dependencies = [
 [[package]]
 name = "wireplumber-sys"
 version = "0.1.0"
-source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=2c0ee463d029d3562ee66db90554c5af573565c1#2c0ee463d029d3562ee66db90554c5af573565c1"
+source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -1255,3 +1291,12 @@ dependencies = [
  "pipewire-sys",
  "system-deps",
 ]
+
+[[package]]
+name = "yansi-term"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
+dependencies = [
+ "winapi",
+]
diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/applications/audio/pwvucontrol/default.nix
index f6733b1e4fdfd..2726f1bedcab3 100644
--- a/pkgs/applications/audio/pwvucontrol/default.nix
+++ b/pkgs/applications/audio/pwvucontrol/default.nix
@@ -32,21 +32,21 @@ let
     };
   });
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pwvucontrol";
-  version = "0.4.2";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "pwvucontrol";
-    rev = version;
-    hash = "sha256-cWNWdCMk9hF8Nzq2UFBEKSx1zS8JlplMG7B5gv7BaZA=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-s4sop1qmqPVOGX7erRfClUUcixNhi+wUY5MXSmv+zVk=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "wireplumber-0.1.0" = "sha256-r3p4OpmMgiFgjn1Fj4LeMOhx6R2UWollIdJRy/0kiNM=";
+      "wireplumber-0.1.0" = "sha256-ocagwmjyhfx6n/9xKxF2vhylqy2HunKQRx3eMo6m/l4=";
     };
   };
 
@@ -73,12 +73,16 @@ stdenv.mkDerivation rec {
     wireplumber_0_4
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Pipewire Volume Control";
     homepage = "https://github.com/saivert/pwvucontrol";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda Guanran928 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      figsoda
+      Guanran928
+      johnrtitor
+    ];
     mainProgram = "pwvucontrol";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index c583f08d02f7b..ee994b56efb0a 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     description = "Internet radio player for linux";
     homepage = "https://github.com/ebruck/radiotray-ng";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 1cd653df3a3c5..ad935b09ed16a 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = "https://ccrma.stanford.edu/software/snd/";
     platforms = platforms.unix;
     license = licenses.free;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "snd";
   };
 }
diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix
index f44904badf9c9..9e83c0472ff53 100644
--- a/pkgs/applications/audio/touchosc/default.nix
+++ b/pkgs/applications/audio/touchosc/default.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     description = "Next generation modular control surface";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ];
     mainProgram = "TouchOSC";
   };
diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix
index c34b1a19405b4..fc62098ba0db4 100644
--- a/pkgs/applications/backup/restic-integrity/default.nix
+++ b/pkgs/applications/backup/restic-integrity/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "CLI tool to check the integrity of a restic repository without unlocking it";
     homepage = "https://git.nwex.de/networkException/restic-integrity";
     license = with licenses; [ bsd2 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "restic-integrity";
   };
 }
diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/applications/blockchains/dcrctl/default.nix
index c388bd75f724e..eb8f53d1cda59 100644
--- a/pkgs/applications/blockchains/dcrctl/default.nix
+++ b/pkgs/applications/blockchains/dcrctl/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     homepage = "https://decred.org";
     description = "Secure Decred wallet daemon written in Go (golang)";
     license = with lib.licenses; [ isc ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "dcrctl";
   };
 }
diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix
index 89fa92a316155..42f4be7a227bd 100644
--- a/pkgs/applications/blockchains/namecoin/default.nix
+++ b/pkgs/applications/blockchains/namecoin/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
     homepage = "https://namecoin.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix
index 82b6d12153611..836532c00badd 100644
--- a/pkgs/applications/blockchains/wownero/default.nix
+++ b/pkgs/applications/blockchains/wownero/default.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://wownero.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index ddf37bb69fc6d..ebc3c246518a8 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage = "https://bviplus.sourceforge.net";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "bviplus";
   };
 }
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 7579b888c28ff..acfafcacbef8f 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -1,7747 +1,10629 @@
 { callPackage }:
-  {
-    ace-window = callPackage ({ avy
-                              , elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "ace-window";
-        ename = "ace-window";
-        version = "0.10.0.0.20220911.35841";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ace-window-0.10.0.0.20220911.35841.tar";
-          sha256 = "0xfc1pw7m4vg0xvj40djm7rxqr0405pby3rgl5vyd8ci5kpmmvhs";
-        };
-        packageRequires = [ avy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ace-window.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ack = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ack";
-        ename = "ack";
-        version = "1.11.0.20220924.84123";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar";
-          sha256 = "0vic2izviakj6qh2l15jd8qm8yr0h0qhy4r8sx7zdngpi9i14r5v";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ack.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    activities = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib
-                              , persist }:
-      elpaBuild {
-        pname = "activities";
-        ename = "activities";
-        version = "0.8pre0.20240709.193836";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240709.193836.tar";
-          sha256 = "1spvk9z1gc522nq36mhyvn86cq9j64chd3mkizj21j93wkd5i3gy";
-        };
-        packageRequires = [ emacs persist ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/activities.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ada-mode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , gnat-compiler
-                            , lib
-                            , uniquify-files
-                            , wisi }:
-      elpaBuild {
-        pname = "ada-mode";
-        ename = "ada-mode";
-        version = "8.1.0.0.20231018.91522";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar";
-          sha256 = "07kd6dj1dbds68qmi4dh4w3fc8l18jyxrfbz4lxb5v9c59hk8c46";
-        };
-        packageRequires = [ emacs gnat-compiler uniquify-files wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ada-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ada-ref-man = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "ada-ref-man";
-        ename = "ada-ref-man";
-        version = "2020.1.0.20201129.190419";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ada-ref-man-2020.1.0.20201129.190419.tar";
-          sha256 = "0a201fn9xs3vg52vri8aw2p56rsw428hk745m6hja6q5gn6rl0zw";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    adaptive-wrap = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "adaptive-wrap";
-        ename = "adaptive-wrap";
-        version = "0.8.0.20240113.95028";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar";
-          sha256 = "0dj20mmipnik62480cm11rnvsvbc3js2ql5r321kj20g87rz9l2a";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    adjust-parens = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "adjust-parens";
-        ename = "adjust-parens";
-        version = "3.2.0.20240113.95404";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar";
-          sha256 = "0l7s63dfpar2ddiydl43m6ipzc7qghv9k5hfcnj56aj6hs7ibcd2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    advice-patch = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "advice-patch";
-        ename = "advice-patch";
-        version = "0.1.0.20201220.233221";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar";
-          sha256 = "1bca9s6cxpsyvyl0fxqa59x68rpdj44kxcaxmaa0lsy10vgib542";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/advice-patch.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aggressive-completion = callPackage ({ elpaBuild
-                                         , emacs
-                                         , fetchurl
-                                         , lib }:
-      elpaBuild {
-        pname = "aggressive-completion";
-        ename = "aggressive-completion";
-        version = "1.7.0.20220417.71805";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar";
-          sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aggressive-indent = callPackage ({ elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "aggressive-indent";
-        ename = "aggressive-indent";
-        version = "1.10.0.0.20230112.100030";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar";
-          sha256 = "0vp49nz5n82pcds2hxqz0fy5zcmvcrpfd1zgsm1cwyph7vvx7djj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    agitate = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "agitate";
-        ename = "agitate";
-        version = "0.0.20240117.23316";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar";
-          sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/agitate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ahungry-theme = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "ahungry-theme";
-        ename = "ahungry-theme";
-        version = "1.10.0.0.20211231.115425";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar";
-          sha256 = "0iddqqkv9i3d9yajhysl54av91i0gdngxqyn7vvapf1nz3pxzrvz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aircon-theme = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "aircon-theme";
-        ename = "aircon-theme";
-        version = "0.0.6.0.20240613.140459";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar";
-          sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    all = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "all";
-        ename = "all";
-        version = "1.1.0.20240405.133638";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/all-1.1.0.20240405.133638.tar";
-          sha256 = "0cybsyr7ksgslwdfnrz8cpymk34f9gz75ahz368rhg926qlxy95j";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/all.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "altcaps";
-        ename = "altcaps";
-        version = "1.2.0.0.20240117.23410";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar";
-          sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/altcaps.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ampc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ampc";
-        ename = "ampc";
-        version = "0.2.0.20240220.181558";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240220.181558.tar";
-          sha256 = "139gqhijy92qnprk25av550zd7165ilsnnmdx4v0v0fnwgxnya7h";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ampc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    arbitools = callPackage ({ cl-lib ? null
-                             , elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "arbitools";
-        ename = "arbitools";
-        version = "0.977.0.20221212.221354";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/arbitools-0.977.0.20221212.221354.tar";
-          sha256 = "0s9w9hfki33bnfgm7yyhhcl0kbpn1ahd5li7nfy409zcb5spz17h";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/arbitools.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ascii-art-to-unicode = callPackage ({ elpaBuild
-                                        , fetchurl
-                                        , lib }:
-      elpaBuild {
-        pname = "ascii-art-to-unicode";
-        ename = "ascii-art-to-unicode";
-        version = "1.13.0.20230911.4520";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ascii-art-to-unicode-1.13.0.20230911.4520.tar";
-          sha256 = "10x2svbc9qkrcckwjfsd1rlcqbvapvrb80x8m0p2awffwisr165j";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    assess = callPackage ({ elpaBuild, emacs, fetchurl, lib, m-buffer }:
-      elpaBuild {
-        pname = "assess";
-        ename = "assess";
-        version = "0.7.0.20240303.95456";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar";
-          sha256 = "0yqiqlgnhqvqc4w9s05csk2h2iwyv1m32wb121v6famfqaicgl12";
-        };
-        packageRequires = [ emacs m-buffer ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/assess.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    async = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "async";
-        ename = "async";
-        version = "1.9.8.0.20240712.45742";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240712.45742.tar";
-          sha256 = "0a4zbpb58mdcmfq7vfwbsqhcfghxx8c3fkvwsrlg5a3gdcjv4ymv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/async.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auctex = callPackage ({ elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib }:
-      elpaBuild {
-        pname = "auctex";
-        ename = "auctex";
-        version = "14.0.6.0.20240630.205810";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240630.205810.tar";
-          sha256 = "0d1pkrqghyz2fqf7qs1yxnibjq0c7a0633j4kq7aqahcb9izpzj1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auctex-cont-latexmk = callPackage ({ auctex
-                                       , elpaBuild
-                                       , emacs
-                                       , fetchurl
-                                       , lib }:
-      elpaBuild {
-        pname = "auctex-cont-latexmk";
-        ename = "auctex-cont-latexmk";
-        version = "0.2.0.20240625.221402";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.2.0.20240625.221402.tar";
-          sha256 = "1yxc34q68cnri7k9m2gdnhhwyqz0gs1ip2r956fbxv65s0s7nbab";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auctex-label-numbers = callPackage ({ auctex
-                                        , elpaBuild
-                                        , emacs
-                                        , fetchurl
-                                        , lib }:
-      elpaBuild {
-        pname = "auctex-label-numbers";
-        ename = "auctex-label-numbers";
-        version = "0.2.0.20240617.174703";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20240617.174703.tar";
-          sha256 = "14zj8wgk1vs96z5sba4m3m0zhl02zr3mbapgpypf9ff4c28v8g1b";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "aumix-mode";
-        ename = "aumix-mode";
-        version = "7.0.20221221.74552";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/aumix-mode-7.0.20221221.74552.tar";
-          sha256 = "0c3yhk8ir4adv3wy80iywbvl1sm86xssg0j0q4rym50pr4vqx60n";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-correct = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "auto-correct";
-        ename = "auto-correct";
-        version = "1.1.4.0.20221221.74656";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auto-correct-1.1.4.0.20221221.74656.tar";
-          sha256 = "10h6b5px4krcwjwhc475al9kcizijsz773zkcijrfi83283l35nc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-correct.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-header = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "auto-header";
-        ename = "auto-header";
-        version = "0.1.2.0.20230407.82136";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auto-header-0.1.2.0.20230407.82136.tar";
-          sha256 = "1dm5nqcvbya9fyj45q6k8ni507prs3ij2q5rhdl9m8vwkq6gf72w";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-header.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-overlays = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "auto-overlays";
-        ename = "auto-overlays";
-        version = "0.10.10.0.20201215.220815";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auto-overlays-0.10.10.0.20201215.220815.tar";
-          sha256 = "1gmsli1bil210867x642x4zvhqradl3d4pk4n5ky5g6xp1h36c7w";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    autocrypt = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "autocrypt";
-        ename = "autocrypt";
-        version = "0.4.2.0.20240410.70023";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar";
-          sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/autocrypt.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "avy";
-        ename = "avy";
-        version = "0.5.0.0.20230424.65712";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar";
-          sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/avy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bbdb";
-        ename = "bbdb";
-        version = "3.2.2.4.0.20231023.5901";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar";
-          sha256 = "16m5irp1y9crv13l2qncafys4fscwq2d28ig8hnx4g5bag9bi7j4";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bbdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "beacon";
-        ename = "beacon";
-        version = "1.3.4.0.20220729.220057";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar";
-          sha256 = "1dpd3j2aip3zi3ivbszsgrifw43bryx01df868hmrxm1s0vvjhh6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/beacon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "beframe";
-        ename = "beframe";
-        version = "1.1.1.0.20240522.34215";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240522.34215.tar";
-          sha256 = "1ws11ynbcgi37sbh6p3nilq9ca26694qzqvd1h4dk0lb815b66l4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/beframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bicep-ts-mode = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "bicep-ts-mode";
-        ename = "bicep-ts-mode";
-        version = "0.1.3.0.20240530.63226";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240530.63226.tar";
-          sha256 = "0xmljjfx7a5b3jfqf7cbpb9102ci5vnkqqww1b328rr42v5sdmqm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bind-key = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "bind-key";
-        ename = "bind-key";
-        version = "2.4.1.0.20240321.194020";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar";
-          sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bind-key.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    blist = callPackage ({ elpaBuild, emacs, fetchurl, ilist, lib }:
-      elpaBuild {
-        pname = "blist";
-        ename = "blist";
-        version = "0.3.0.20231213.61103";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/blist-0.3.0.20231213.61103.tar";
-          sha256 = "01pqf794syngh6v4bym3qzg2rh2gp3z9h6hvpw74nadimfg5pz61";
-        };
-        packageRequires = [ emacs ilist ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/blist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bluetooth = callPackage ({ dash
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "bluetooth";
-        ename = "bluetooth";
-        version = "0.3.1.0.20230119.122638";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar";
-          sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bluetooth.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bnf-mode = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "bnf-mode";
-        ename = "bnf-mode";
-        version = "0.4.5.0.20221205.150230";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar";
-          sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    boxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "boxy";
-        ename = "boxy";
-        version = "1.1.4.0.20240505.204058";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar";
-          sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/boxy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    boxy-headings = callPackage ({ boxy
-                                 , elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib
-                                 , org }:
-      elpaBuild {
-        pname = "boxy-headings";
-        ename = "boxy-headings";
-        version = "2.1.6.0.20240505.204122";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar";
-          sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph";
-        };
-        packageRequires = [ boxy emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/boxy-headings.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    breadcrumb = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib
-                              , project }:
-      elpaBuild {
-        pname = "breadcrumb";
-        ename = "breadcrumb";
-        version = "1.0.1.0.20231126.221621";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar";
-          sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/breadcrumb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "brief";
-        ename = "brief";
-        version = "5.91.0.20240401.34715";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/brief-5.91.0.20240401.34715.tar";
-          sha256 = "1knpamvbpz92b9zql6p0l7g1p5595l6kns0gw1vfhm7cl37dngyr";
-        };
-        packageRequires = [ cl-lib nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/brief.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buffer-env = callPackage ({ compat
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "buffer-env";
-        ename = "buffer-env";
-        version = "0.6.0.20240323.72724";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar";
-          sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buffer-env.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buffer-expose = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "buffer-expose";
-        ename = "buffer-expose";
-        version = "0.4.3.0.20190429.135558";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar";
-          sha256 = "0f3a064i4a1ylb1ibqmz302h24kymir3zj1d225b7v6r89nam216";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bufferlo";
-        ename = "bufferlo";
-        version = "0.8.0.20240621.221659";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar";
-          sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bufferlo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bug-hunter = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , fetchurl
-                              , lib
-                              , seq }:
-      elpaBuild {
-        pname = "bug-hunter";
-        ename = "bug-hunter";
-        version = "1.3.1.0.20201128.92354";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bug-hunter-1.3.1.0.20201128.92354.tar";
-          sha256 = "1bskf9csg49n4cisl57wv0sa74s6v3wffdxw80m3r2yr0kx01cfs";
-        };
-        packageRequires = [ cl-lib seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buildbot = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "buildbot";
-        ename = "buildbot";
-        version = "0.0.1.0.20230726.134747";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar";
-          sha256 = "1z27pfx3h1fad9wiazrkqgfdc1h06g2rlb3cq1zk83hilg64nnjd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buildbot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    calibre = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "calibre";
-        ename = "calibre";
-        version = "1.4.1.0.20240208.85735";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/calibre-1.4.1.0.20240208.85735.tar";
-          sha256 = "1rbmck8bc28c2rf321606w748nqc5klly6yrm3r8zyviggwd1v2c";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/calibre.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "cape";
-        ename = "cape";
-        version = "1.5.0.20240710.192144";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cape-1.5.0.20240710.192144.tar";
-          sha256 = "0kg9qv8qkcs2v3x1dkyg3j1zxqql000bhbdh7awfk42dfq181lcj";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    capf-autosuggest = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "capf-autosuggest";
-        ename = "capf-autosuggest";
-        version = "0.3.0.20211123.104430";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar";
-          sha256 = "0f16csl2ky8kys3wcv41zqh1l9976gc009pjy21kp6ck0pm0m3kg";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    caps-lock = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "caps-lock";
-        ename = "caps-lock";
-        version = "1.0.0.20221221.74713";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/caps-lock-1.0.0.20221221.74713.tar";
-          sha256 = "0f8n79yw9zs1cpa8nhqmvw95kj762lv8rzrkj30ybvj1612vl1z9";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/caps-lock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    captain = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "captain";
-        ename = "captain";
-        version = "1.0.3.0.20221221.74732";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/captain-1.0.3.0.20221221.74732.tar";
-          sha256 = "0ay26xzbhrxgvslrwcc504k5s0kxk0c8rnps656xz1wl38fbvm5b";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/captain.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "chess";
-        ename = "chess";
-        version = "2.0.5.0.20220926.150547";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/chess-2.0.5.0.20220926.150547.tar";
-          sha256 = "16md052m600mmy43fgpcpwl4jz5q67v9w2h3y234ild6sp1qanlj";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/chess.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cl-generic = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "cl-generic";
-        ename = "cl-generic";
-        version = "0.3.0.20221221.74800";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cl-generic-0.3.0.20221221.74800.tar";
-          sha256 = "1yhjgcc3rnhi0kf2mgm7yii1pa9hzz0dnfkg393p456rl07q7vqq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cl-generic.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cl-lib = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cl-lib";
-        ename = "cl-lib";
-        version = "0.7.1.0.20221221.74809";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cl-lib-0.7.1.0.20221221.74809.tar";
-          sha256 = "1xig9cma7p5bplnqnxmwh1axxlf813ar69bzyvks09yhg04jikm1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cl-lib.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    clipboard-collector = callPackage ({ elpaBuild
-                                       , emacs
-                                       , fetchurl
-                                       , lib }:
-      elpaBuild {
-        pname = "clipboard-collector";
-        ename = "clipboard-collector";
-        version = "0.3.0.20190215.154741";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar";
-          sha256 = "03y1wivagbsl4f2qgmxcy43pbpvpxhd1d57ihpdvsl2illb6bwlq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cobol-mode = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "cobol-mode";
-        ename = "cobol-mode";
-        version = "1.1.0.20240505.191317";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20240505.191317.tar";
-          sha256 = "1nv0594a244yp5rv9y7bna37sr4cn0869g7i48888dphg6savlb7";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    code-cells = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "code-cells";
-        ename = "code-cells";
-        version = "0.4.0.20231119.213845";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20231119.213845.tar";
-          sha256 = "1i66d234fb9g4aqnpzjz9dn6hs37bq5l1vrk076hib1rb1vm36ir";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/code-cells.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    colorful-mode = callPackage ({ compat
-                                 , elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "colorful-mode";
-        ename = "colorful-mode";
-        version = "1.0.4.0.20240712.155246";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240712.155246.tar";
-          sha256 = "1n2b5av3k8kwx6f5x0ziq7virv7n2d9npw11s934qzq3qfk2m8i3";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    comint-mime = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "comint-mime";
-        ename = "comint-mime";
-        version = "0.4.0.20240426.193136";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240426.193136.tar";
-          sha256 = "1znk6anr6yxb9jfh3z7702msl011k54z37vbixbdk2bvd7hihcx3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/comint-mime.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    compact-docstrings = callPackage ({ elpaBuild
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "compact-docstrings";
-        ename = "compact-docstrings";
-        version = "0.2.0.20220305.183958";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/compact-docstrings-0.2.0.20220305.183958.tar";
-          sha256 = "024l45bxxkh6x7rd8qcmykxdhdj0yckcf7vzacl7ynzwm9ah7sry";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/compact-docstrings.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "company";
-        ename = "company";
-        version = "0.10.2.0.20240713.30311";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240713.30311.tar";
-          sha256 = "166sgcwvwysvnlwm91bz2c4k85y846qflpg80ywyhnjklskldjh9";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company-ebdb = callPackage ({ company
-                                , ebdb
-                                , elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "company-ebdb";
-        ename = "company-ebdb";
-        version = "1.1.0.20221221.74915";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/company-ebdb-1.1.0.20221221.74915.tar";
-          sha256 = "1qidrgcm2hdkrbh75rjfzxbmbyvxvyfy4m2kd6lgcx0v494lzvqw";
-        };
-        packageRequires = [ company ebdb ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company-math = callPackage ({ company
-                                , elpaBuild
-                                , fetchurl
-                                , lib
-                                , math-symbol-lists }:
-      elpaBuild {
-        pname = "company-math";
-        ename = "company-math";
-        version = "1.5.1.0.20221227.132907";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/company-math-1.5.1.0.20221227.132907.tar";
-          sha256 = "070kfw13aw1hfvkdxb83zic44301nawnl57saqwrg6lh0psxpyxv";
-        };
-        packageRequires = [ company math-symbol-lists ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company-math.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company-statistics = callPackage ({ company
-                                      , elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "company-statistics";
-        ename = "company-statistics";
-        version = "0.2.3.0.20170210.193350";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar";
-          sha256 = "0fwvaadfr5jlx3021kfjbij9692c2v3l600v2rwqijc563phdfg3";
-        };
-        packageRequires = [ company emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company-statistics.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    compat = callPackage ({ elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , seq }:
-      elpaBuild {
-        pname = "compat";
-        ename = "compat";
-        version = "30.0.0.0.0.20240708.182228";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240708.182228.tar";
-          sha256 = "0qgr35606hqz5x6161lwq8zv15z08pm1xbfv32qgzpszmyj8855d";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/compat.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "consult";
-        ename = "consult";
-        version = "1.7.0.20240710.202854";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-1.7.0.20240710.202854.tar";
-          sha256 = "0l4w88530qh65m5wkh8i5z2sv3zfm1jylr3885s550ix0dq45503";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-denote = callPackage ({ consult
-                                  , denote
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "consult-denote";
-        ename = "consult-denote";
-        version = "0.1.1.0.20240703.93551";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-denote-0.1.1.0.20240703.93551.tar";
-          sha256 = "1275qhz4fyrh1qr1mjhzy923x4rs90v80sdiazmszn72dcvp25bq";
-        };
-        packageRequires = [ consult denote emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-denote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-hoogle = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , haskell-mode
-                                  , lib }:
-      elpaBuild {
-        pname = "consult-hoogle";
-        ename = "consult-hoogle";
-        version = "0.2.1.0.20240427.131842";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar";
-          sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m";
-        };
-        packageRequires = [ emacs haskell-mode ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-recoll = callPackage ({ consult
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "consult-recoll";
-        ename = "consult-recoll";
-        version = "0.8.1.0.20231211.122134";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar";
-          sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1";
-        };
-        packageRequires = [ consult emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    context-coloring = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "context-coloring";
-        ename = "context-coloring";
-        version = "8.1.0.0.20240331.133753";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20240331.133753.tar";
-          sha256 = "1m8c7vccdb868n777rqi8mhjwfbm25q7hbx7x6y145mxmnqr1vgn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/context-coloring.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "corfu";
-        ename = "corfu";
-        version = "1.4.0.20240711.184800";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/corfu-1.4.0.20240711.184800.tar";
-          sha256 = "0fvpsblz8750vlnv4mbwh0zz90xn35svbii2hyz2ngzb0yjrygch";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/corfu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "coterm";
-        ename = "coterm";
-        version = "1.6.0.20221015.160420";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar";
-          sha256 = "1633q3vrqhjfv4ipirirgkpmal5j1rfh6jxkq3sm3qwlg8lgak4s";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/coterm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    counsel = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , ivy
-                           , lib
-                           , swiper }:
-      elpaBuild {
-        pname = "counsel";
-        ename = "counsel";
-        version = "0.14.2.0.20240520.132838";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240520.132838.tar";
-          sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr";
-        };
-        packageRequires = [ emacs ivy swiper ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/counsel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cpio-mode = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "cpio-mode";
-        ename = "cpio-mode";
-        version = "0.17.0.20211211.193556";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar";
-          sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cpupower = callPackage ({ elpaBuild
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "cpupower";
-        ename = "cpupower";
-        version = "1.0.5.0.20230704.131557";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20230704.131557.tar";
-          sha256 = "1xls5wjxrx2a193piav0yp0sv1m7jv5zqk46hbxxhfakl3jg5zlq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cpupower.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    crdt = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "crdt";
-        ename = "crdt";
-        version = "0.3.5.0.20230213.22302";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar";
-          sha256 = "0cl97di7s5a1v6widil63pwzywxpcxmhvhp34kqn256czsliv4pw";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/crdt.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    crisp = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "crisp";
-        ename = "crisp";
-        version = "1.3.6.0.20221221.74923";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/crisp-1.3.6.0.20221221.74923.tar";
-          sha256 = "0kpw81h9n8qwrvmqan9bwj32d4vgsrmma4f0rig04bdx0mxmdzir";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/crisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    csharp-mode = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "csharp-mode";
-        ename = "csharp-mode";
-        version = "2.0.0.0.20221205.181941";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar";
-          sha256 = "1cmc6b7pwjalzipc2clis2si7d03r0glpgxj7qpvfdp26y1cjabv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "csv-mode";
-        ename = "csv-mode";
-        version = "1.25.0.20240529.65338";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/csv-mode-1.25.0.20240529.65338.tar";
-          sha256 = "0rr4gz38y1gyzg8mwyl62macjq31rs6fvx3pngamyq1y3ghpivsb";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/csv-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "cursory";
-        ename = "cursory";
-        version = "1.0.1.0.20240425.35714";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar";
-          sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cursory.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cycle-quotes = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "cycle-quotes";
-        ename = "cycle-quotes";
-        version = "0.1.0.20221221.75021";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cycle-quotes-0.1.0.20221221.75021.tar";
-          sha256 = "0igwwbhf1b6c67znik3zphdngddkgai146qcjlkgg1ihr4ajc3pc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cycle-quotes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dape = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }:
-      elpaBuild {
-        pname = "dape";
-        ename = "dape";
-        version = "0.13.0.0.20240711.211516";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dape-0.13.0.0.20240711.211516.tar";
-          sha256 = "13wzg3z8pfd0gydld2np2bih7bpmpvm98m6z5cwmc2bfh20p8xpa";
-        };
-        packageRequires = [ emacs jsonrpc ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "darkroom";
-        ename = "darkroom";
-        version = "0.3.0.20200507.173652";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/darkroom-0.3.0.20200507.173652.tar";
-          sha256 = "1j57wa2jhpjs6ynda73s0vv4dzyr9jg0lifv7nc8bv79lr4sjab2";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/darkroom.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dash";
-        ename = "dash";
-        version = "2.19.1.0.20240510.132708";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar";
-          sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dash.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dbus-codegen = callPackage ({ cl-lib ? null
-                                , elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "dbus-codegen";
-        ename = "dbus-codegen";
-        version = "0.1.0.20220306.62546";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dbus-codegen-0.1.0.20220306.62546.tar";
-          sha256 = "1jg8ibxy79g93b3hl97bpgz90ny5q936k8bjcmxix7hn82wg7a9l";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }:
-      elpaBuild {
-        pname = "debbugs";
-        ename = "debbugs";
-        version = "0.40.0.20240318.175047";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar";
-          sha256 = "02kb6klsixyxn4a65mgr9m8n1cx68n7zqyym8m14381k0mi8pq0h";
-        };
-        packageRequires = [ emacs soap-client ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/debbugs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "delight";
-        ename = "delight";
-        version = "1.7.0.20200711.42851";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/delight-1.7.0.20200711.42851.tar";
-          sha256 = "1v8yhii0s1rs1c2i7gs2rd98224qhpkybvrks8w5ghq4p3nxrrvw";
-        };
-        packageRequires = [ cl-lib nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/delight.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    denote = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "denote";
-        ename = "denote";
-        version = "3.0.6.0.20240712.154245";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/denote-3.0.6.0.20240712.154245.tar";
-          sha256 = "134s5mgkrsi65skvhqic89ch9806ln6s9glhh8dz552yb46pwbdd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/denote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    denote-menu = callPackage ({ denote
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "denote-menu";
-        ename = "denote-menu";
-        version = "1.2.0.0.20240712.110155";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20240712.110155.tar";
-          sha256 = "182dbr5hay13nca52qyymmrsmfcwd62ncayjh76ii0jn3khbcqzf";
-        };
-        packageRequires = [ denote emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/denote-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    detached = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "detached";
-        ename = "detached";
-        version = "0.10.1.0.20221129.143049";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar";
-          sha256 = "0fidhqf1m599v939hv3xsqbkckgk2fm550i7lkh0p961a3v542i8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/detached.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "devdocs";
-        ename = "devdocs";
-        version = "0.6.1.0.20240428.71147";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar";
-          sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/devdocs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    devicetree-ts-mode = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "devicetree-ts-mode";
-        ename = "devicetree-ts-mode";
-        version = "0.3.0.20240117.132538";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar";
-          sha256 = "12jfiv7j0k5sqjbz28nd5x34hpxp76lyl41fl7bvsgiyb06i0gnf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dict-tree = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , heap
-                             , lib
-                             , tNFA
-                             , trie }:
-      elpaBuild {
-        pname = "dict-tree";
-        ename = "dict-tree";
-        version = "0.17.0.20231015.24654";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dict-tree-0.17.0.20231015.24654.tar";
-          sha256 = "0nij9pkscr6mdjmrq9dlqnks91sd21pn01bsgn4zk918zygnkggj";
-        };
-        packageRequires = [ emacs heap tNFA trie ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dict-tree.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diff-hl = callPackage ({ cl-lib ? null
-                           , elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "diff-hl";
-        ename = "diff-hl";
-        version = "1.9.2.0.20240702.202011";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240702.202011.tar";
-          sha256 = "12i8vl4jiv3v952h7amlmzkvvdpdfmfj77xz3hyjyrr6zvdhygls";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diff-hl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diffview = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "diffview";
-        ename = "diffview";
-        version = "1.0.0.20230224.111651";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/diffview-1.0.0.20230224.111651.tar";
-          sha256 = "1shw58jk2dzr8sc9hhfjqjrmwqarvq989ic96zjmhajxvcqcz3ql";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diffview.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "diminish";
-        ename = "diminish";
-        version = "0.46.0.20220909.84745";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar";
-          sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diminish.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-du = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "dired-du";
-        ename = "dired-du";
-        version = "0.5.2.0.20221221.75108";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar";
-          sha256 = "0h31k45sx47vmk20sn77fzz86gbwiqxrryr091p5s05smrlsfxc2";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-du.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-duplicates = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "dired-duplicates";
-        ename = "dired-duplicates";
-        version = "0.4.0.20240328.201645";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dired-duplicates-0.4.0.20240328.201645.tar";
-          sha256 = "0122wxl2sql31s4h7rf7mxz6kv15m77q9bqmixxsgzhfghbia7k7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-git-info = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "dired-git-info";
-        ename = "dired-git-info";
-        version = "0.3.1.0.20191229.192948";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar";
-          sha256 = "0zq74nynra4cbyb81l3v9w0qrzz057z9abg6c6zjshlrq8kxv5kx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-preview = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "dired-preview";
-        ename = "dired-preview";
-        version = "0.2.0.0.20240507.55800";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240507.55800.tar";
-          sha256 = "1m7zgmjhw86yrhj5chci73rbgky3ybzni5j6xvwpxqxl6g41ph04";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-preview.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    disk-usage = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "disk-usage";
-        ename = "disk-usage";
-        version = "1.3.3.0.20230920.164444";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar";
-          sha256 = "06vd56yaaz9a6b46g4r6ccasc74pyqls9krj3bcrdayhj34w3mxy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/disk-usage.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dismal = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dismal";
-        ename = "dismal";
-        version = "1.5.2.0.20221221.75154";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar";
-          sha256 = "0nyy9dkafkzxvx60d1bzrn2a1m3n53al3x17r3kf7d2b24gcljbd";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dismal.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    djvu = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "djvu";
-        ename = "djvu";
-        version = "1.1.2.0.20221221.75224";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/djvu-1.1.2.0.20221221.75224.tar";
-          sha256 = "0iirmzaah0nix14jaj0hnszrdkdsh4wli8hb951l7iw7szkc5fsp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/djvu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    do-at-point = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "do-at-point";
-        ename = "do-at-point";
-        version = "0.1.2.0.20240625.155102";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20240625.155102.tar";
-          sha256 = "035f0gqywlrr8cwwk9b04nczcv8slf76f2ixvam949fphhc0zkrb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/do-at-point.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "doc-toc";
-        ename = "doc-toc";
-        version = "1.2.0.20230409.212954";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar";
-          sha256 = "1gcdkcb1ydgl24jmrnkg1a7kndl7kkvckwf12y5pj2l2idf9ifx8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/doc-toc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    docbook = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "docbook";
-        ename = "docbook";
-        version = "0.1.0.20221221.75233";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/docbook-0.1.0.20221221.75233.tar";
-          sha256 = "0r7sjnbj4wgqa2vw57ac28gixw762km0cwas0qhclxizb95nsnz2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/docbook.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "drepl";
-        ename = "drepl";
-        version = "0.3.0.20240603.71909";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240603.71909.tar";
-          sha256 = "0fjs0k36xm2sy3p0yi2km7pcrjv3f0gsc6qbrh47qimn7x5b9bkh";
-        };
-        packageRequires = [ comint-mime emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/drepl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dts-mode";
-        ename = "dts-mode";
-        version = "1.0.0.20221221.75311";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar";
-          sha256 = "1bpd6npx70rzh3mb5235g1ydh839bnjag70qp17r0wd2wkj6w0gj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    easy-escape = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "easy-escape";
-        ename = "easy-escape";
-        version = "0.2.1.0.20210917.85414";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/easy-escape-0.2.1.0.20210917.85414.tar";
-          sha256 = "0hk9244g7hgnan7xd4451qjklfqh5hbkxjl60l32nr19ynw0ygif";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/easy-escape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    easy-kill = callPackage ({ cl-lib ? null
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "easy-kill";
-        ename = "easy-kill";
-        version = "0.9.5.0.20220511.55730";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar";
-          sha256 = "0il8lhi2j80sz63lnjkayryikcya03zn3z40bnfjbsydpyqj4kzd";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/easy-kill.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "ebdb";
-        ename = "ebdb";
-        version = "0.8.22.0.20240305.123820";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar";
-          sha256 = "0j6wflmslapq3wr5bg6ql7qamh9k9zzp1xzadkxq3i3124syanfs";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ebdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ebdb-gnorb = callPackage ({ ebdb
-                              , elpaBuild
-                              , fetchurl
-                              , gnorb
-                              , lib }:
-      elpaBuild {
-        pname = "ebdb-gnorb";
-        ename = "ebdb-gnorb";
-        version = "1.0.2.0.20221221.75324";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ebdb-gnorb-1.0.2.0.20221221.75324.tar";
-          sha256 = "0lzsarv0pkdgkj19il0syk7yz6gcfkp0rl3i49rsqb3lpf5b6s5q";
-        };
-        packageRequires = [ ebdb gnorb ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ebdb-i18n-chn = callPackage ({ ebdb
-                                 , elpaBuild
-                                 , fetchurl
-                                 , lib
-                                 , pyim }:
-      elpaBuild {
-        pname = "ebdb-i18n-chn";
-        ename = "ebdb-i18n-chn";
-        version = "1.3.2.0.20221221.75334";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ebdb-i18n-chn-1.3.2.0.20221221.75334.tar";
-          sha256 = "16hna0z08903pkq957cgxk26ihq6j3fab775ickb24zfssjm3l61";
-        };
-        packageRequires = [ ebdb pyim ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ediprolog";
-        ename = "ediprolog";
-        version = "2.2.0.20221026.91800";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar";
-          sha256 = "0y2xa0k7sv21yabxkfzxnl0fdnppgcwx5jdnm1zw2j2sbaf9k6ca";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ediprolog.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "eev";
-        ename = "eev";
-        version = "20240710.0.20240710.214351";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eev-20240710.0.20240710.214351.tar";
-          sha256 = "120yka4xv6zqcd7gi6c4qlgydyqv86s15p444jsjiz57zvc5p991";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eev.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ef-themes = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "ef-themes";
-        ename = "ef-themes";
-        version = "1.7.0.0.20240605.183445";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240605.183445.tar";
-          sha256 = "09zmi2rsykdjkmj7hdylsqhqfd87i1g2g4v6sizm94s0hmvxa148";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ef-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eglot = callPackage ({ compat
-                         , eldoc
-                         , elpaBuild
-                         , emacs
-                         , external-completion
-                         , fetchurl
-                         , flymake ? null
-                         , jsonrpc
-                         , lib
-                         , project
-                         , seq
-                         , track-changes
-                         , xref }:
-      elpaBuild {
-        pname = "eglot";
-        ename = "eglot";
-        version = "1.17.0.20240707.154630";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240707.154630.tar";
-          sha256 = "0f7lbbsh5y4945j8115ph5i2k9c3r0ipcxhmig9kvba6knrshgin";
-        };
-        packageRequires = [
-          compat
-          eldoc
-          emacs
-          external-completion
-          flymake
-          jsonrpc
-          project
-          seq
-          track-changes
-          xref
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eglot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    el-search = callPackage ({ cl-print ? null
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , stream }:
-      elpaBuild {
-        pname = "el-search";
-        ename = "el-search";
-        version = "1.12.6.1.0.20221221.75346";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/el-search-1.12.6.1.0.20221221.75346.tar";
-          sha256 = "12500xc7aln09kzf3kn6xq7xnphbqzmyz20h0sgpf8f1rvlh2h33";
-        };
-        packageRequires = [ cl-print emacs stream ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/el-search.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "eldoc";
-        ename = "eldoc";
-        version = "1.15.0.0.20240708.123037";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar";
-          sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eldoc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    electric-spacing = callPackage ({ elpaBuild
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "electric-spacing";
-        ename = "electric-spacing";
-        version = "5.0.0.20201201.154407";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/electric-spacing-5.0.0.20201201.154407.tar";
-          sha256 = "0ywa68zwci0v6g9nc8czlhvf9872vl262nrxffahc5r7lp1hay8k";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    elisp-benchmarks = callPackage ({ elpaBuild
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "elisp-benchmarks";
-        ename = "elisp-benchmarks";
-        version = "1.16.0.20240708.114026";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240708.114026.tar";
-          sha256 = "1njklwjfmwmxzhd535bkq32ljx99rb0q0jspg02vy88w89wbnkb8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ellama = callPackage ({ compat
-                          , elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , llm
-                          , spinner }:
-      elpaBuild {
-        pname = "ellama";
-        ename = "ellama";
-        version = "0.11.9.0.20240710.202758";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ellama-0.11.9.0.20240710.202758.tar";
-          sha256 = "01qfp01lgs84xzzkkky4539bvmakf3xbgr1h57asfsy3j50nsblf";
-        };
-        packageRequires = [ compat emacs llm spinner ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ellama.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    emacs-gc-stats = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "emacs-gc-stats";
-        ename = "emacs-gc-stats";
-        version = "1.4.2.0.20231206.152254";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar";
-          sha256 = "08ivfm6m9y4i1w0xmjkbs6b2h7i5q1v2991rjs2w5s9d864yqg2l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "embark";
-        ename = "embark";
-        version = "1.1.0.20240607.161338";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/embark-1.1.0.20240607.161338.tar";
-          sha256 = "14ar8sfjrk1q6f2dis2w8qa8nsqla8cz91l4nsssr1mfgs7x517b";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/embark.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    embark-consult = callPackage ({ compat
-                                  , consult
-                                  , elpaBuild
-                                  , emacs
-                                  , embark
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "embark-consult";
-        ename = "embark-consult";
-        version = "1.1.0.20240607.161338";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240607.161338.tar";
-          sha256 = "1m48pddbyxpi7ji9cl0pd4npkl6xj7fdak4raacglbgayg4z9qdb";
-        };
-        packageRequires = [ compat consult emacs embark ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/embark-consult.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ement = callPackage ({ elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib
-                         , map
-                         , persist
-                         , plz
-                         , svg-lib
-                         , taxy
-                         , taxy-magit-section
-                         , transient }:
-      elpaBuild {
-        pname = "ement";
-        ename = "ement";
-        version = "0.16pre0.20240707.203749";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ement-0.16pre0.20240707.203749.tar";
-          sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2";
-        };
-        packageRequires = [
-          emacs
-          map
-          persist
-          plz
-          svg-lib
-          taxy
-          taxy-magit-section
-          transient
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ement.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    emms = callPackage ({ cl-lib ? null
-                        , elpaBuild
-                        , fetchurl
-                        , lib
-                        , nadvice
-                        , seq }:
-      elpaBuild {
-        pname = "emms";
-        ename = "emms";
-        version = "20.1.0.20240704.95932";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/emms-20.1.0.20240704.95932.tar";
-          sha256 = "1mid0m39af2mcq99xbdjxiiliw6axaysm6cfriyl00w0w6ybfrjf";
-        };
-        packageRequires = [ cl-lib nadvice seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/emms.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    engrave-faces = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "engrave-faces";
-        ename = "engrave-faces";
-        version = "0.3.1.0.20240421.82802";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20240421.82802.tar";
-          sha256 = "0dxj9m9jyvrqhv67m2kkh0akjc7l6h40fvsy20k721zq9xvc6zkl";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "enwc";
-        ename = "enwc";
-        version = "2.0.0.20171007.121321";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar";
-          sha256 = "0c308kd1pinhb1lh2vi40bcnmvzydf1j7sqka9kajhxr0l4kjazb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/enwc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    epoch-view = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "epoch-view";
-        ename = "epoch-view";
-        version = "0.0.1.0.20221221.75416";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/epoch-view-0.0.1.0.20221221.75416.tar";
-          sha256 = "0hd51d441c2w05rx10wpa0rbc94pjwwaqy5mxlgfwnx52jabz15h";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/epoch-view.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    erc = callPackage ({ compat
-                       , elpaBuild
-                       , emacs
-                       , fetchurl
-                       , lib }:
-      elpaBuild {
-        pname = "erc";
-        ename = "erc";
-        version = "5.6.1snapshot0.20240709.13309";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240709.13309.tar";
-          sha256 = "1ijn2rwl2lpqckps4xxqxsn6385y84xmid83a2cj4fkkgjks7jnv";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/erc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ergoemacs-mode = callPackage ({ cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , nadvice }:
-      elpaBuild {
-        pname = "ergoemacs-mode";
-        ename = "ergoemacs-mode";
-        version = "5.16.10.12.0.20240129.80712";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240129.80712.tar";
-          sha256 = "0jsl7yyhbcg1y20lp50r3i3rcxmxq035mks1kwbsnyqmdikby9s3";
-        };
-        packageRequires = [ cl-lib emacs nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ess = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ess";
-        ename = "ess";
-        version = "24.1.1.0.20240516.81354";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240516.81354.tar";
-          sha256 = "0r4kk65sd8kzdm11c7dz1m4qicjv6zg36r7gdg2mzpl0ym33g8aj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ess.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    excorporate = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , fsm
-                               , lib
-                               , nadvice
-                               , soap-client
-                               , url-http-ntlm
-                               , url-http-oauth }:
-      elpaBuild {
-        pname = "excorporate";
-        ename = "excorporate";
-        version = "1.1.2.0.20240219.90343";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/excorporate-1.1.2.0.20240219.90343.tar";
-          sha256 = "0wm1qx1y9az3fdh81hjccpsw4xxx0p9acz9pfvsyjlywclcycd4i";
-        };
-        packageRequires = [
-          cl-lib
-          emacs
-          fsm
-          nadvice
-          soap-client
-          url-http-ntlm
-          url-http-oauth
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/excorporate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    expand-region = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "expand-region";
-        ename = "expand-region";
-        version = "1.0.0.0.20240119.103925";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar";
-          sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/expand-region.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    expreg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "expreg";
-        ename = "expreg";
-        version = "1.3.1.0.20230915.150818";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar";
-          sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/expreg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    external-completion = callPackage ({ elpaBuild
-                                       , fetchurl
-                                       , lib }:
-      elpaBuild {
-        pname = "external-completion";
-        ename = "external-completion";
-        version = "0.1.0.20240616.203826";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240616.203826.tar";
-          sha256 = "1zg7v08wbk8ma5k2zj0jrchf2wz483bklgi0rshjividniy99877";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/external-completion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    exwm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, xelb }:
-      elpaBuild {
-        pname = "exwm";
-        ename = "exwm";
-        version = "0.31.0.20240708.212458";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240708.212458.tar";
-          sha256 = "0cb9y753d7gj40wfwg4my339kiffdydch1bmhdqw1haf3a21srar";
-        };
-        packageRequires = [ compat emacs xelb ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/exwm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    f90-interface-browser = callPackage ({ cl-lib ? null
-                                         , elpaBuild
-                                         , fetchurl
-                                         , lib }:
-      elpaBuild {
-        pname = "f90-interface-browser";
-        ename = "f90-interface-browser";
-        version = "1.1.0.20221221.75553";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/f90-interface-browser-1.1.0.20221221.75553.tar";
-          sha256 = "0qv3v3ya8qdgwq0plcc3qbba4n66fqww3sawmqhzssksry39l1yj";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    face-shift = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "face-shift";
-        ename = "face-shift";
-        version = "0.2.1.0.20230426.73945";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar";
-          sha256 = "0gl9k7g3wsc045dx9mp9ypk084r4j3mhf2a4xn08lzz8z8i9k2rz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/face-shift.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    filechooser = callPackage ({ compat
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "filechooser";
-        ename = "filechooser";
-        version = "0.2.1.0.20240707.120050";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar";
-          sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/filechooser.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    filladapt = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "filladapt";
-        ename = "filladapt";
-        version = "2.12.2.0.20221221.75607";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar";
-          sha256 = "11s9n8d4psjs4dbsx2w8hyir5hapz952da5nz3xihli8a0q93mhv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/filladapt.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    firefox-javascript-repl = callPackage ({ elpaBuild
-                                           , emacs
-                                           , fetchurl
-                                           , lib }:
-      elpaBuild {
-        pname = "firefox-javascript-repl";
-        ename = "firefox-javascript-repl";
-        version = "0.9.5.0.20230605.161924";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar";
-          sha256 = "1nfkzx07j3hddai213lia9pixfrrdajrvg7fvlx5js8zxfpvcjx6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "flylisp";
-        ename = "flylisp";
-        version = "0.2.0.20221221.75619";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar";
-          sha256 = "110hfk979c664y27qf5af54phm8i4iq5qqk5vygjwd7252nd7i4a";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flylisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake = callPackage ({ eldoc
-                           , elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , project }:
-      elpaBuild {
-        pname = "flymake";
-        ename = "flymake";
-        version = "1.3.7.0.20240707.154630";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240707.154630.tar";
-          sha256 = "1y1r7hz8692y1q9n75vgq26liilaaiz1h8l3jh3n6dqyzll6c2wi";
-        };
-        packageRequires = [ eldoc emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-codespell = callPackage ({ compat
-                                     , elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "flymake-codespell";
-        ename = "flymake-codespell";
-        version = "0.1.0.20231030.222337";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar";
-          sha256 = "1v3a2gg4myav4cs1vj4d5isxhbw9qvryk5r2dx3x19qqmmmm6djz";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-proselint = callPackage ({ elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "flymake-proselint";
-        ename = "flymake-proselint";
-        version = "0.3.0.0.20230325.160756";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar";
-          sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    fontaine = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "fontaine";
-        ename = "fontaine";
-        version = "2.0.0.0.20240426.105847";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240426.105847.tar";
-          sha256 = "0h7l5agnzpq8k14c3lr6dkpsh2id9akiqa9z3x88xn440rjbld51";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/fontaine.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    frame-tabs = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "frame-tabs";
-        ename = "frame-tabs";
-        version = "1.1.0.20221221.75627";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/frame-tabs-1.1.0.20221221.75627.tar";
-          sha256 = "08ql56h8h425ngs40m9zpy4ysxlxi74vanlkga42bskzax0ns2cm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    frog-menu = callPackage ({ avy
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , posframe }:
-      elpaBuild {
-        pname = "frog-menu";
-        ename = "frog-menu";
-        version = "0.2.11.0.20201115.95734";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/frog-menu-0.2.11.0.20201115.95734.tar";
-          sha256 = "00ihlqq4bxgrp6hdf1b6xhnvp87ilys1ykp0l38cs5lv6a10wvqs";
-        };
-        packageRequires = [ avy emacs posframe ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/frog-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "fsm";
-        ename = "fsm";
-        version = "0.2.1.0.20221212.223608";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar";
-          sha256 = "1zwl1b9sn4imxynada0vf8nxwm49lh8fahxfc35czlbn0w0jqm1k";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/fsm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ftable";
-        ename = "ftable";
-        version = "1.1.0.20230102.145125";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar";
-          sha256 = "0231qjah5s76g8dmnc5zpn6i6lysypf6jvvzmnyyv92lr8arzmfz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ftable.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gcmh";
-        ename = "gcmh";
-        version = "0.2.1.0.20201116.225142";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar";
-          sha256 = "0yb47avdy5f3a2g9cg2028h5agsqpddsbfsc6ncavnxnnyiccj8h";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gcmh.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ggtags";
-        ename = "ggtags";
-        version = "0.9.0.0.20230602.13355";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar";
-          sha256 = "1krykf1hknczhdhh8rfj4vzcba87q5sjbv0p2y41mcvmmfnhharw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ggtags.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gited";
-        ename = "gited";
-        version = "0.6.0.0.20221221.75709";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar";
-          sha256 = "095679pq1lam42zran5qjk3zd4gf908vd5fkq9jppqlilcsqf7zb";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gited.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gle-mode";
-        ename = "gle-mode";
-        version = "1.1.0.20221221.75729";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gle-mode-1.1.0.20221221.75729.tar";
-          sha256 = "1bakvlx4bzz62hibwwm0hmhyzqqzy31xvsg6pw3lh2i028qd1ykx";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gle-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnat-compiler = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib
-                                 , wisi }:
-      elpaBuild {
-        pname = "gnat-compiler";
-        ename = "gnat-compiler";
-        version = "1.0.3.0.20230915.165808";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar";
-          sha256 = "0rm0s33nl9dzghlfsprycr2na412z4vnfc69q2pc6nlazsliz6w0";
-        };
-        packageRequires = [ emacs wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnome-c-style = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "gnome-c-style";
-        ename = "gnome-c-style";
-        version = "0.1.0.20230924.235858";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20230924.235858.tar";
-          sha256 = "0gij2d1k40yhifr7ad3p465f5lg77cb441pl41mdc0g6v5gipnqf";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnorb";
-        ename = "gnorb";
-        version = "1.6.11.0.20230108.110132";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnorb-1.6.11.0.20230108.110132.tar";
-          sha256 = "0jha80xr8pbribp0ki40cydvi35as7v2c2xsy0anh65j9ciym5ag";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnorb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnu-elpa = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnu-elpa";
-        ename = "gnu-elpa";
-        version = "1.1.0.20221212.224322";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar";
-          sha256 = "0hk9ha7f0721wnsnjazpr970lfa4q03dhpxxffw9qcn1mlvh8qb8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnu-elpa.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnu-elpa-keyring-update = callPackage ({ elpaBuild
-                                           , fetchurl
-                                           , lib }:
-      elpaBuild {
-        pname = "gnu-elpa-keyring-update";
-        ename = "gnu-elpa-keyring-update";
-        version = "2022.12.1.0.20240525.173808";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.1.0.20240525.173808.tar";
-          sha256 = "0s8fydk7b3qc6zv90n3bjniczr5911jkza5xqwi69cb1v9fbfjyd";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnugo = callPackage ({ ascii-art-to-unicode
-                         , cl-lib ? null
-                         , elpaBuild
-                         , fetchurl
-                         , lib
-                         , xpm }:
-      elpaBuild {
-        pname = "gnugo";
-        ename = "gnugo";
-        version = "3.1.2.0.20230911.4426";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar";
-          sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj";
-        };
-        packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnugo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnus-mock = callPackage ({ elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "gnus-mock";
-        ename = "gnus-mock";
-        version = "0.5.0.20210503.105756";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnus-mock-0.5.0.20210503.105756.tar";
-          sha256 = "1gpjbx9iabrx2b4qinw0chv44g2v1z2ivaiywjzr3vy3h3pp6fga";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gpastel";
-        ename = "gpastel";
-        version = "0.5.0.0.20231030.71342";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar";
-          sha256 = "1d5pj1rk0xv2fww827yplpcll5hy8w9fkcm9c8wf4yi3l6igkmgz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gpastel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gpr-mode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , gnat-compiler
-                            , lib
-                            , wisi }:
-      elpaBuild {
-        pname = "gpr-mode";
-        ename = "gpr-mode";
-        version = "1.0.5.0.20231115.90848";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar";
-          sha256 = "1m768s196027zl402vmfvdzvdl3whbjg5lyfiwjx25d9gfx32351";
-        };
-        packageRequires = [ emacs gnat-compiler wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gpr-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gpr-query = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , gnat-compiler
-                             , lib
-                             , wisi }:
-      elpaBuild {
-        pname = "gpr-query";
-        ename = "gpr-query";
-        version = "1.0.4.0.20231018.92052";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar";
-          sha256 = "0j0p685v1v0byma8x5lpihvfj6hyg30dx8jqa6q0xmm2c6i8cqai";
-        };
-        packageRequires = [ emacs gnat-compiler wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gpr-query.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "graphql";
-        ename = "graphql";
-        version = "0.1.2.0.20221202.2453";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar";
-          sha256 = "0wh1lnn85nj026iln02b7p5hgrwd3dmqjkv48gc33ypyd4afh31z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/graphql.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    greader = callPackage ({ compat
-                           , elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , seq }:
-      elpaBuild {
-        pname = "greader";
-        ename = "greader";
-        version = "0.11.13.0.20240712.232251";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/greader-0.11.13.0.20240712.232251.tar";
-          sha256 = "08gajcssq4h84r61sh1hpg86dklrh86slvd3q5b65nlwps5mslh6";
-        };
-        packageRequires = [ compat emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/greader.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "greenbar";
-        ename = "greenbar";
-        version = "1.1.0.20221221.80217";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/greenbar-1.1.0.20221221.80217.tar";
-          sha256 = "00kch8c0sz5z3cx0likx0pyqp9jxvjd6lkmdcli4zzpc6j1f1a0k";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/greenbar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gtags-mode = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "gtags-mode";
-        ename = "gtags-mode";
-        version = "1.8.0.20240712.131914";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gtags-mode-1.8.0.20240712.131914.tar";
-          sha256 = "1rzmgzirxxrhm8f3vbwf76nrrzd1svf4ddy20h0khp7ycldhd3hp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    guess-language = callPackage ({ cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , nadvice }:
-      elpaBuild {
-        pname = "guess-language";
-        ename = "guess-language";
-        version = "0.0.1.0.20240528.185800";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20240528.185800.tar";
-          sha256 = "0hlcnd69mqs90ndp59pqcjdwl27cswnpqy6yjzaspmbya6plv3g6";
-        };
-        packageRequires = [ cl-lib emacs nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/guess-language.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hcel";
-        ename = "hcel";
-        version = "1.0.0.0.20221012.11633";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar";
-          sha256 = "03k08w10bvl6fz7nkmv2d7kksphxigw6cwfhfq0kkgxn4l8h37an";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hcel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    heap = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "heap";
-        ename = "heap";
-        version = "0.5.0.20201214.121301";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/heap-0.5.0.20201214.121301.tar";
-          sha256 = "0917bfrdiwwmdqmnpy2cg1dn7v5gyl7damwp6ld7sky6v3d113ya";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/heap.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hiddenquote = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "hiddenquote";
-        ename = "hiddenquote";
-        version = "1.2.0.20231107.184113";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar";
-          sha256 = "0iy7mxqhph4kmp4a96r141f4dpk5vwiydx9i9gx5c13zzwvy2y7r";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    highlight-escape-sequences = callPackage ({ elpaBuild
-                                              , fetchurl
-                                              , lib }:
-      elpaBuild {
-        pname = "highlight-escape-sequences";
-        ename = "highlight-escape-sequences";
-        version = "0.4.0.20201214.173014";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/highlight-escape-sequences-0.4.0.20201214.173014.tar";
-          sha256 = "13x8750r3zn9sqbsxliiipk6kfnpg7clmd49niyrh80x9nj4pf72";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hook-helpers = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "hook-helpers";
-        ename = "hook-helpers";
-        version = "1.1.1.0.20201201.93957";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar";
-          sha256 = "0x3358k5lglnb4yf27c2ybzlsw9jp4n4jh5sizczl9n8g1vxbgkb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    html5-schema = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "html5-schema";
-        ename = "html5-schema";
-        version = "0.1.0.20221221.80245";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/html5-schema-0.1.0.20221221.80245.tar";
-          sha256 = "15f1nhsgpp0mv8mdrvv0jnscq0j23ggriw2d2dw26sr6lv93w2r4";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/html5-schema.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hydra = callPackage ({ elpaBuild, emacs, fetchurl, lib, lv }:
-      elpaBuild {
-        pname = "hydra";
-        ename = "hydra";
-        version = "0.15.0.0.20221030.224757";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar";
-          sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn";
-        };
-        packageRequires = [ emacs lv ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hydra.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hyperbole = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "hyperbole";
-        ename = "hyperbole";
-        version = "9.0.2pre0.20240707.235928";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240707.235928.tar";
-          sha256 = "1rrj0zmc5wfrdzzwpihpxrw6xawswnkszb1753p5sg3sxmj5h2kw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hyperbole.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    idlwave = callPackage ({ elpaBuild
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "idlwave";
-        ename = "idlwave";
-        version = "6.5.1.0.20240523.142720";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/idlwave-6.5.1.0.20240523.142720.tar";
-          sha256 = "00i7kl0j7aacm7vyjgmm2kqhjjb3s70g69ka3sqhigm7s1hn3zk9";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/idlwave.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ilist = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ilist";
-        ename = "ilist";
-        version = "0.3.0.20240219.40214";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ilist-0.3.0.20240219.40214.tar";
-          sha256 = "0nxwvnpnyccx384f8ik0z8a74fksvwrmpdzk4wia1x6wdwwvblvs";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ilist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    inspector = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "inspector";
-        ename = "inspector";
-        version = "0.36.0.20230925.194622";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/inspector-0.36.0.20230925.194622.tar";
-          sha256 = "1g989zgbhila0f4yca70iwgnqr0zcainji9mps0ywrmlmn270gdv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/inspector.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ioccur";
-        ename = "ioccur";
-        version = "2.6.0.20211231.163129";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar";
-          sha256 = "0v048d1p95km3jwgs6x805fjg6qfv5pjwdwia1wzl9liqai21v1c";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ioccur.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    isearch-mb = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "isearch-mb";
-        ename = "isearch-mb";
-        version = "0.8.0.20240310.84654";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar";
-          sha256 = "1rb97ir8nbv7ici8isjcm4bfaxakd6a05yxv9as2wv9xl8fzfhwq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    iterators = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "iterators";
-        ename = "iterators";
-        version = "0.1.1.0.20221221.80300";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar";
-          sha256 = "10cx933rk7f92jk8q87b69ls3w823fwxnr7i6j0bxpzjx66q15yk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/iterators.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ivy";
-        ename = "ivy";
-        version = "0.14.2.0.20240524.114155";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar";
-          sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-avy = callPackage ({ avy
-                           , elpaBuild
-                           , emacs
-                           , fetchurl
-                           , ivy
-                           , lib }:
-      elpaBuild {
-        pname = "ivy-avy";
-        ename = "ivy-avy";
-        version = "0.14.2.0.20240214.214218";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20240214.214218.tar";
-          sha256 = "1i3hrc5pb30qkzzpiza0mff97132b04sglg39mg0ad05hl3sq5dc";
-        };
-        packageRequires = [ avy emacs ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-explorer = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , ivy
-                                , lib }:
-      elpaBuild {
-        pname = "ivy-explorer";
-        ename = "ivy-explorer";
-        version = "0.3.2.0.20190909.192125";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar";
-          sha256 = "1jvahaswknvaia62cq8bz5lx55fb1c07zr63n7awcp0sajk3ph3z";
-        };
-        packageRequires = [ emacs ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-hydra = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , hydra
-                             , ivy
-                             , lib }:
-      elpaBuild {
-        pname = "ivy-hydra";
-        ename = "ivy-hydra";
-        version = "0.14.2.0.20240214.214337";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20240214.214337.tar";
-          sha256 = "1paqprwizhavr1kfijfbr0my3ncmw94821d3c9qj1fnjkp3nfj4x";
-        };
-        packageRequires = [ emacs hydra ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-posframe = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , ivy
-                                , lib
-                                , posframe }:
-      elpaBuild {
-        pname = "ivy-posframe";
-        ename = "ivy-posframe";
-        version = "0.6.3.0.20211217.23411";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar";
-          sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69";
-        };
-        packageRequires = [ emacs ivy posframe ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jami-bot = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "jami-bot";
-        ename = "jami-bot";
-        version = "0.0.4.0.20240204.184721";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240204.184721.tar";
-          sha256 = "04zdnrah3jypkyx8dl0ns7cjcws5yv4d56ixaa94vjjjvyw9d8mv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jami-bot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jarchive = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "jarchive";
-        ename = "jarchive";
-        version = "0.11.0.0.20231010.221311";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar";
-          sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jarchive.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "javaimp";
-        ename = "javaimp";
-        version = "0.9.1.0.20221221.80314";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar";
-          sha256 = "0dj7mzdfj1gvd18mdnf19pv5zljhhada6a5s3bm5drpw12vx5334";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/javaimp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jgraph-mode = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "jgraph-mode";
-        ename = "jgraph-mode";
-        version = "1.1.0.20221221.80333";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jgraph-mode-1.1.0.20221221.80333.tar";
-          sha256 = "1ddmyxanfnqfmwx3ld25awm4qhwbzavla8xan261nyh4wwnm8hfq";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jinx = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "jinx";
-        ename = "jinx";
-        version = "1.9.0.20240708.212221";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jinx-1.9.0.20240708.212221.tar";
-          sha256 = "10lp9pnlxaxr1rblkg3996m6bvhdkqhc4my8gxbswxsv9djaw621";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jinx.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jit-spell = callPackage ({ compat
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "jit-spell";
-        ename = "jit-spell";
-        version = "0.4.0.20240604.141707";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240604.141707.tar";
-          sha256 = "0qz81zrqhdymir9kbmkyavb591abv2j5iz1in2y0v96hpilxfdw6";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jit-spell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    js2-mode = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "js2-mode";
-        ename = "js2-mode";
-        version = "20231224.0.20240418.608";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar";
-          sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/js2-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "json-mode";
-        ename = "json-mode";
-        version = "0.2.0.20221221.80401";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar";
-          sha256 = "0hr0dqnz3c9bc78k3nnwrhwqhgyjq1qpnjfa7wd9bsla3gfp88hk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/json-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jsonrpc = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "jsonrpc";
-        ename = "jsonrpc";
-        version = "1.0.25.0.20240616.203826";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240616.203826.tar";
-          sha256 = "0jkhhds21vw4i03ya8lflkkh0yaqxqhj49zdzb1l7wgsb499hhya";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jumpc = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "jumpc";
-        ename = "jumpc";
-        version = "3.1.0.20231015.14814";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jumpc-3.1.0.20231015.14814.tar";
-          sha256 = "1v8jxyvs0540w6rdsy96a49lb8nhrq4r66mmvc42j8lh7k4nggdw";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jumpc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kind-icon = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , svg-lib }:
-      elpaBuild {
-        pname = "kind-icon";
-        ename = "kind-icon";
-        version = "0.2.2.0.20240321.120430";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar";
-          sha256 = "1cwp2cc2qy36s4zz6arfr760a9x77h0cj42q6a0s32l56sddh7ws";
-        };
-        packageRequires = [ emacs svg-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kind-icon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }:
-      elpaBuild {
-        pname = "kiwix";
-        ename = "kiwix";
-        version = "1.1.5.0.20220316.84759";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar";
-          sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna";
-        };
-        packageRequires = [ emacs request ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kiwix.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "kmb";
-        ename = "kmb";
-        version = "0.1.0.20221221.80420";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar";
-          sha256 = "00zqrfh1nqn01azmkd2gy3il48h1sddp6addj9yfq4kwd7ylhym5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kmb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    landmark = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "landmark";
-        ename = "landmark";
-        version = "1.0.0.20221221.80428";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/landmark-1.0.0.20221221.80428.tar";
-          sha256 = "1rwiysmynp2z4bfynhf9k1zd3y5s6dyp2312vq1rhyifgdd8mivq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/landmark.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    latex-table-wizard = callPackage ({ auctex
-                                      , elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , transient }:
-      elpaBuild {
-        pname = "latex-table-wizard";
-        ename = "latex-table-wizard";
-        version = "1.5.4.0.20230903.170436";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.4.0.20230903.170436.tar";
-          sha256 = "1y1crsd29fvqabzwzki7jqziarycix6bib0cmxlrfsqs95y7dr5w";
-        };
-        packageRequires = [ auctex emacs transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "leaf";
-        ename = "leaf";
-        version = "4.5.5.0.20230803.74443";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar";
-          sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/leaf.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lentic = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib, m-buffer }:
-      elpaBuild {
-        pname = "lentic";
-        ename = "lentic";
-        version = "0.12.0.20240303.95600";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/lentic-0.12.0.20240303.95600.tar";
-          sha256 = "0w6fl0yzmh0gd3d5d5049zrx341x0jrj48g265jy4jywdvk621kv";
-        };
-        packageRequires = [ dash emacs m-buffer ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lentic.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lentic-server = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lentic
-                                 , lib
-                                 , web-server }:
-      elpaBuild {
-        pname = "lentic-server";
-        ename = "lentic-server";
-        version = "0.2.0.20240314.214448";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/lentic-server-0.2.0.20240314.214448.tar";
-          sha256 = "1mg12bkwsqm4nwwwmpfx3dav583i96dsk5ap5hjiz2ggwwrmrq8h";
-        };
-        packageRequires = [ lentic web-server ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lentic-server.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    let-alist = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "let-alist";
-        ename = "let-alist";
-        version = "1.0.6.0.20240102.14710";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar";
-          sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/let-alist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lex = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "lex";
-        ename = "lex";
-        version = "1.2.0.20240216.82808";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/lex-1.2.0.20240216.82808.tar";
-          sha256 = "0mh2jk838216mwv6bab28mq9nb5617c5y7s0yqynkz3vkarnnxx1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lex.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lin = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "lin";
-        ename = "lin";
-        version = "1.0.0.0.20240117.24849";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20240117.24849.tar";
-          sha256 = "1yjqq1zzv0a7ydhjjh7ycgwd8fzlkvza3m8dm9wa45lqljf5ysim";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lin.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    listen = callPackage ({ elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , persist
-                          , taxy
-                          , taxy-magit-section
-                          , transient }:
-      elpaBuild {
-        pname = "listen";
-        ename = "listen";
-        version = "0.10pre0.20240419.165028";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240419.165028.tar";
-          sha256 = "1bmjnigb4ly14i3n7wgd0jx4k0g06cf2n3dapfdwlv80bi57x20a";
-        };
-        packageRequires = [ emacs persist taxy taxy-magit-section transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/listen.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    literate-scratch = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "literate-scratch";
-        ename = "literate-scratch";
-        version = "1.0.0.20240621.41043";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/literate-scratch-1.0.0.20240621.41043.tar";
-          sha256 = "0k1vgb1pmrdhq0mlvrpgdsamqfbhvrjwm2jgixla82j7814zzckq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
-      elpaBuild {
-        pname = "llm";
-        ename = "llm";
-        version = "0.16.1.0.20240706.201250";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/llm-0.16.1.0.20240706.201250.tar";
-          sha256 = "0kx90fqdsp762774f07jb4m9vr4lnimls45g4a16rq7xy783cd57";
-        };
-        packageRequires = [ emacs plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/llm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "lmc";
-        ename = "lmc";
-        version = "1.4.0.20230105.113402";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar";
-          sha256 = "0ldwr9gw0bkcj43w5x84qwq2gvv2nr53711wlh42zawh0dyhm8h7";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lmc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    load-dir = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "load-dir";
-        ename = "load-dir";
-        version = "0.0.5.0.20221221.80456";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/load-dir-0.0.5.0.20221221.80456.tar";
-          sha256 = "00ynwml6xf7341z1w0wz1afh9jc4v8ggc8izy8qcvdiawxc418iq";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/load-dir.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    load-relative = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "load-relative";
-        ename = "load-relative";
-        version = "1.3.2.0.20230214.53224";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/load-relative-1.3.2.0.20230214.53224.tar";
-          sha256 = "19pkb7xqyllll2pgyqs7bv0qfbv6n9i5qlx9rjzm4ws0c9j464zd";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/load-relative.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    loc-changes = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "loc-changes";
-        ename = "loc-changes";
-        version = "1.2.0.20201201.94106";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/loc-changes-1.2.0.20201201.94106.tar";
-          sha256 = "1jrjqn5600l245vhr5h6zwg6g72k0n721ck94mji755bqd231yxs";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/loc-changes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "loccur";
-        ename = "loccur";
-        version = "1.2.5.0.20240610.183057";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/loccur-1.2.5.0.20240610.183057.tar";
-          sha256 = "1apir3ijix4pkrv8q30xxqbiwvj78vp3y68ffq18fcwiww0gkavf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/loccur.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "logos";
-        ename = "logos";
-        version = "1.1.1.0.20240224.55443";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar";
-          sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/logos.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "luwak";
-        ename = "luwak";
-        version = "1.0.0.0.20221125.50733";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar";
-          sha256 = "0b4kxq5im8gvg1zg12b8ii62w0vsf3gacimwd603srfc5l1rbvcw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/luwak.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lv = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "lv";
-        ename = "lv";
-        version = "0.15.0.0.20221030.224757";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar";
-          sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lv.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    m-buffer = callPackage ({ elpaBuild
-                            , fetchurl
-                            , lib
-                            , seq }:
-      elpaBuild {
-        pname = "m-buffer";
-        ename = "m-buffer";
-        version = "0.16.0.20240302.175529";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar";
-          sha256 = "18lj0gb56xhwrbihijy4p5lyxqvdfcwyabcd30qy1dn4k715v614";
-        };
-        packageRequires = [ seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/m-buffer.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "map";
-        ename = "map";
-        version = "3.3.1.0.20240221.84915";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar";
-          sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/map.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    marginalia = callPackage ({ compat
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "marginalia";
-        ename = "marginalia";
-        version = "1.6.0.20240710.95347";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240710.95347.tar";
-          sha256 = "1943srwzm6w4ixcb48d968pbf4hs3y3rwcmcnryh8az2q3j6sqgm";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/marginalia.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    markchars = callPackage ({ elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "markchars";
-        ename = "markchars";
-        version = "0.2.2.0.20221221.80510";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/markchars-0.2.2.0.20221221.80510.tar";
-          sha256 = "0f1n1jzhksl5cl5c4n2arqhj2zkwzs8i4yzdz39y2b51x2gi2yav";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/markchars.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    math-symbol-lists = callPackage ({ elpaBuild
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "math-symbol-lists";
-        ename = "math-symbol-lists";
-        version = "1.3.0.20220828.204754";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/math-symbol-lists-1.3.0.20220828.204754.tar";
-          sha256 = "0q038qwcq7lg3a7n451gw80xlwv4hczz3432xcx00hxgvlh744yc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mct = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mct";
-        ename = "mct";
-        version = "1.0.0.0.20240429.72524";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar";
-          sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mct.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    memory-usage = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "memory-usage";
-        ename = "memory-usage";
-        version = "0.2.0.20201201.223908";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/memory-usage-0.2.0.20201201.223908.tar";
-          sha256 = "1jybms0756sswwdq8gqc6kpp5m7y971v4yzcmhraykhf32rwf4rq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/memory-usage.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "metar";
-        ename = "metar";
-        version = "0.3.0.20221221.80722";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/metar-0.3.0.20221221.80722.tar";
-          sha256 = "08xcxx9wbjkqf6s1rbsp54f648r8n122k66nfd8ibv9qbd8qvmxq";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/metar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "midi-kbd";
-        ename = "midi-kbd";
-        version = "0.2.0.20221221.80736";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar";
-          sha256 = "0fz9r0y3qdnaq9wi00151xzqh3ygwcfw6yl32cs1vaaxv2czkjai";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mines";
-        ename = "mines";
-        version = "1.6.0.20201130.184335";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar";
-          sha256 = "0vl93im89fg72wpcqdhg1x2l4iybznh6gjvpkr1i29y05fsx2aad";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mines.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minibuffer-header = callPackage ({ elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "minibuffer-header";
-        ename = "minibuffer-header";
-        version = "0.5.0.20220921.71345";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar";
-          sha256 = "1s77h5s2abpm75k57zcp1s525qs74sdm6vpzlkvqjz8lpn8zkkp0";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minibuffer-line = callPackage ({ elpaBuild
-                                   , fetchurl
-                                   , lib }:
-      elpaBuild {
-        pname = "minibuffer-line";
-        ename = "minibuffer-line";
-        version = "0.1.0.20221221.80745";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/minibuffer-line-0.1.0.20221221.80745.tar";
-          sha256 = "10gl1lnihawv9dw2rzaydyh8cdgpqgj7y8jsr6hjgqv82hxqyccn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minimap = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "minimap";
-        ename = "minimap";
-        version = "1.4.0.20201201.162630";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/minimap-1.4.0.20201201.162630.tar";
-          sha256 = "0h0ydmfinr82j0ifkgwjhc8blg6z2f5k0711fwrcbx8wrgrvfh5v";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minimap.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mmm-mode = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "mmm-mode";
-        ename = "mmm-mode";
-        version = "0.5.11.0.20240222.42825";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/mmm-mode-0.5.11.0.20240222.42825.tar";
-          sha256 = "037g19hdya14q7wivdcw8h7wyx8lb8pw5waya3ak435cyfmpg1a7";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    modus-themes = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "modus-themes";
-        ename = "modus-themes";
-        version = "4.4.0.0.20240709.63840";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240709.63840.tar";
-          sha256 = "19yys9lkfsrcbib4rd0ph8d1a3698bih0ghihpb7i1mxy2x0dxwj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/modus-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mpdired";
-        ename = "mpdired";
-        version = "2.0.20240614.95804";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar";
-          sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mpdired.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    multi-mode = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "multi-mode";
-        ename = "multi-mode";
-        version = "1.14.0.20221221.80812";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar";
-          sha256 = "1r41alsvaab8h5cngy0hjs78shv60qp1g68jppl5qlhd6a7h95ih";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/multi-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    multishell = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "multishell";
-        ename = "multishell";
-        version = "1.1.10.0.20220605.120254";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/multishell-1.1.10.0.20220605.120254.tar";
-          sha256 = "0pl45mwwgdf505sviyzacalq6kisq0pnh99i1cnclrmjkjy6yxz9";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/multishell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    muse = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "muse";
-        ename = "muse";
-        version = "3.20.2.0.20240209.184001";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/muse-3.20.2.0.20240209.184001.tar";
-          sha256 = "1sn5siingpzg4y5wjc3ff2ln98gb7hhvwmhnvhmmqbnb8r459vs0";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/muse.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "myers";
-        ename = "myers";
-        version = "0.1.0.20221221.80834";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar";
-          sha256 = "11nwn1nysr09r1701cd3wvkzn01s19l6lla0f33vqm66ahj9yldh";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/myers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nadvice = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "nadvice";
-        ename = "nadvice";
-        version = "0.4.0.20230111.104526";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar";
-          sha256 = "0855x3vgp0i6kmi5kf8365xqnj92k9lwqyfn40i59fp4jj3c00kr";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nadvice.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nameless = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "nameless";
-        ename = "nameless";
-        version = "1.0.2.0.20230112.95905";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar";
-          sha256 = "1b44w8jkqqsi995a2daw05ks64njlgpkab6m3iy3lx3v8fggjahp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nameless.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    names = callPackage ({ cl-lib ? null
-                         , elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib
-                         , nadvice }:
-      elpaBuild {
-        pname = "names";
-        ename = "names";
-        version = "20151201.0.0.20220425.173515";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/names-20151201.0.0.20220425.173515.tar";
-          sha256 = "1s91v83jkwxjl1iqrmjy60rnnqcgzly0z8chp87f7i22fj5gjz4h";
-        };
-        packageRequires = [ cl-lib emacs nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/names.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nano-agenda = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "nano-agenda";
-        ename = "nano-agenda";
-        version = "0.3.0.20230417.100538";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar";
-          sha256 = "1fhpic6zimk81a7w6m9hl6iw0vniz3pl775sxyg167ysn5sqsl2y";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nano-modeline = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "nano-modeline";
-        ename = "nano-modeline";
-        version = "1.1.0.0.20240429.102433";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar";
-          sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nano-theme = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "nano-theme";
-        ename = "nano-theme";
-        version = "0.3.4.0.20240624.80231";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240624.80231.tar";
-          sha256 = "1h2sifcl26av1lzzmngb2svl23hchjnzd8aaszkxxwh34wg1cgnk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nano-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nftables-mode = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "nftables-mode";
-        ename = "nftables-mode";
-        version = "1.1.0.20221221.80909";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar";
-          sha256 = "149qz88wlapln0b8d9mcmj630vyh2ha65hqb46yrf08fch992cpx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nhexl-mode = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "nhexl-mode";
-        ename = "nhexl-mode";
-        version = "1.5.0.20221215.152407";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar";
-          sha256 = "0bdw6lycm1hclz3qzckcpnssrd4i52051dzbs87f9sv6f6v31373";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nlinum = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "nlinum";
-        ename = "nlinum";
-        version = "1.9.0.20221221.80940";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nlinum-1.9.0.20221221.80940.tar";
-          sha256 = "15kw7r8lz9nb5s0rzgdlj1s1kl1l6nxzr7kmwv5i7b1xhpnyn7xn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nlinum.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    notes-mode = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "notes-mode";
-        ename = "notes-mode";
-        version = "1.31.0.20240402.80928";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/notes-mode-1.31.0.20240402.80928.tar";
-          sha256 = "1kiki1b6bx3nn1xgbnh0xnwnhx5wkn0zzlk6jfsks5npj2a4h88g";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/notes-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    notmuch-indicator = callPackage ({ elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "notmuch-indicator";
-        ename = "notmuch-indicator";
-        version = "1.2.0.0.20240511.94138";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar";
-          sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ntlm";
-        ename = "ntlm";
-        version = "2.1.0.0.20240102.22814";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar";
-          sha256 = "0wr9bhxxdkpfvwla97xrd77dv3321apq1gmcpqadyjvxl44c0km7";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ntlm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    num3-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "num3-mode";
-        ename = "num3-mode";
-        version = "1.5.0.20221221.81242";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/num3-mode-1.5.0.20221221.81242.tar";
-          sha256 = "076m1lh9ma1wzavirmy7dq7nsl410n03yf7vq4ljxvbkw801sig7";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/num3-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "oauth2";
-        ename = "oauth2";
-        version = "0.16.0.20221221.81302";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar";
-          sha256 = "1imdggvj98db8cs0s2qx72ifavi6h3flym70zm2g1w8v2fmcq8dj";
-        };
-        packageRequires = [ cl-lib nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/oauth2.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ob-asymptote = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "ob-asymptote";
-        ename = "ob-asymptote";
-        version = "1.0.0.20230908.121002";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar";
-          sha256 = "1lpv4rf7qf1yvpm4j3wiajdk72lgl4gk8qgwflzyq9yvmksakdvp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ob-asymptote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ob-haxe";
-        ename = "ob-haxe";
-        version = "1.0.0.20210211.73431";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ob-haxe-1.0.0.20210211.73431.tar";
-          sha256 = "148bly2nf0r64q2cfm0hd6i26bxaans7aj52nv4gb5qxsiqng0ly";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "objed";
-        ename = "objed";
-        version = "0.8.3.0.20201002.84752";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar";
-          sha256 = "1fjcl2gm4675l430rdr2lihsj13n24pi9zwjfqvsm4bnqbx9ywiz";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/objed.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "omn-mode";
-        ename = "omn-mode";
-        version = "1.3.0.20240326.173146";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/omn-mode-1.3.0.20240326.173146.tar";
-          sha256 = "1iyh0xqm9aag92vj44l4ymrjc0gnn41gckk1l96605cfkwr5m6qa";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/omn-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    on-screen = callPackage ({ cl-lib ? null
-                             , elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "on-screen";
-        ename = "on-screen";
-        version = "1.3.3.0.20201127.191411";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/on-screen-1.3.3.0.20201127.191411.tar";
-          sha256 = "1dak8rb89mkdpv3xc2h0kpn09i4l42iavslvkhy2vxj0qq6c1r9p";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/on-screen.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    openpgp = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "openpgp";
-        ename = "openpgp";
-        version = "1.0.1.0.20230325.141904";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/openpgp-1.0.1.0.20230325.141904.tar";
-          sha256 = "012svyzmr4rwi2a1v99klyjnwrrfqz8jd053f9xjfm44payfafkg";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/openpgp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    orderless = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "orderless";
-        ename = "orderless";
-        version = "1.1.0.20240711.200241";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240711.200241.tar";
-          sha256 = "04ambf76p24z45b5zswbqprbvy31vdg48mk36dmd85apl0myvi95";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/orderless.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org";
-        ename = "org";
-        version = "9.8pre0.20240712.111340";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-9.8pre0.20240712.111340.tar";
-          sha256 = "1nqx0kvmxf7prfip30l1br9gl2s7bmcacds5ifafawywnc720jl6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-contacts = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib
-                                , org }:
-      elpaBuild {
-        pname = "org-contacts";
-        ename = "org-contacts";
-        version = "1.1.0.20240609.105801";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240609.105801.tar";
-          sha256 = "1rx5lnn151wn42zpnrr64g1qn5lvk0syfqm2v4h58np7lsf10c2y";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-contacts.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-edna = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , org
-                            , seq }:
-      elpaBuild {
-        pname = "org-edna";
-        ename = "org-edna";
-        version = "1.1.2.0.20200902.94459";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-edna-1.1.2.0.20200902.94459.tar";
-          sha256 = "043pb34ai8rj515zgbw5nq5x3mkiyqcnk25787qc3mbddi9n9hwq";
-        };
-        packageRequires = [ emacs org seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-edna.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-jami-bot = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , jami-bot
-                                , lib }:
-      elpaBuild {
-        pname = "org-jami-bot";
-        ename = "org-jami-bot";
-        version = "0.0.5.0.20240204.184749";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-jami-bot-0.0.5.0.20240204.184749.tar";
-          sha256 = "1zl9xblhppqwddizf7s7l9d4qzcr8d6vgvjwmiw4wvb4lpyba9r4";
-        };
-        packageRequires = [ emacs jami-bot ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-modern = callPackage ({ compat
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "org-modern";
-        ename = "org-modern";
-        version = "1.3.0.20240708.215718";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-modern-1.3.0.20240708.215718.tar";
-          sha256 = "1r3hk48781j375c307dp3mgb662nk223g6cqfbv72jhqbis7770g";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-modern.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-notify = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "org-notify";
-        ename = "org-notify";
-        version = "0.1.1.0.20231016.93952";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar";
-          sha256 = "0pxm5pbmsf965daf3y7v5x6ca8ddi2a9d4lm04ky3113zz5ay95d";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-notify.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-real = callPackage ({ boxy
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , org }:
-      elpaBuild {
-        pname = "org-real";
-        ename = "org-real";
-        version = "1.0.9.0.20240505.204156";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar";
-          sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp";
-        };
-        packageRequires = [ boxy emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-real.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-remark = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib
-                              , org }:
-      elpaBuild {
-        pname = "org-remark";
-        ename = "org-remark";
-        version = "1.2.2.0.20240629.103632";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar";
-          sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-remark.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-transclusion = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib
-                                    , org }:
-      elpaBuild {
-        pname = "org-transclusion";
-        ename = "org-transclusion";
-        version = "1.4.0.0.20240520.170949";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar";
-          sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-translate = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib
-                                 , org }:
-      elpaBuild {
-        pname = "org-translate";
-        ename = "org-translate";
-        version = "0.1.4.0.20220312.90634";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar";
-          sha256 = "1fq0h0q5nh92dc9vgp7nmqyz2nl0byd2v6vl5k2lk3rlmbx7jnkz";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-translate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "orgalist";
-        ename = "orgalist";
-        version = "1.16.0.20240618.91747";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/orgalist-1.16.0.20240618.91747.tar";
-          sha256 = "0kw1iasyg5j1kghwb952rah040qhybhycsmgk8y0rfk382ra3a1i";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/orgalist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    osc = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "osc";
-        ename = "osc";
-        version = "0.4.0.20221221.81343";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/osc-0.4.0.20221221.81343.tar";
-          sha256 = "0mlyszhc2nbf5p4jnc6wlq8iipzmy9ymvbszq13myza410nd9xqh";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/osc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "osm";
-        ename = "osm";
-        version = "1.3.0.20240708.215736";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/osm-1.3.0.20240708.215736.tar";
-          sha256 = "12w8mgm7b3hg4h6yks0a1z2sy22b91gk5qsbs014ymq1z4mg38m3";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/osm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    other-frame-window = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "other-frame-window";
-        ename = "other-frame-window";
-        version = "1.0.6.0.20221221.81352";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar";
-          sha256 = "11fdg3nl1w4vm46477kwk6d6vz769q726iz5cwknbvjzj8an994s";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pabbrev = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "pabbrev";
-        ename = "pabbrev";
-        version = "4.3.0.0.20240617.162224";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240617.162224.tar";
-          sha256 = "0wkizis0wb6syy2lzp1mi2cn5znzangi1w18jcn5ra8k8xj66yp4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pabbrev.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "paced";
-        ename = "paced";
-        version = "1.1.3.0.20190227.204125";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar";
-          sha256 = "1ykjmv45kkfa569m8hpvya8a7wvkqrg9nbz28sbxmx79abm1bmmi";
-        };
-        packageRequires = [ async emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/paced.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "parsec";
-        ename = "parsec";
-        version = "0.1.3.0.20180729.171626";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar";
-          sha256 = "0lhcj6cjgkq9ha85n0hqcm0ik7avfzw9f8zcklyivwn2bx80r7r7";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/parsec.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    parser-generator = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "parser-generator";
-        ename = "parser-generator";
-        version = "0.2.1.0.20240220.204114";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar";
-          sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/parser-generator.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    path-iterator = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "path-iterator";
-        ename = "path-iterator";
-        version = "1.0.0.20221221.81414";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar";
-          sha256 = "1ln9l9x6bj1sp7shc2iafn11yji6lsgm4fm1ji1kfp3my1zhqc40";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/path-iterator.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "peg";
-        ename = "peg";
-        version = "1.0.1.0.20221221.81502";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar";
-          sha256 = "0gc41pf2gy01bmjgx09c1kifi6pkhcm8jrbdx1ncblhix76ia4q4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/peg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    perl-doc = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "perl-doc";
-        ename = "perl-doc";
-        version = "0.81.0.20230805.210315";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar";
-          sha256 = "0n129rcmn827payv0aqg8iz7dc7wg4rm27hvvw1wwj2k5x5vnd6r";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/perl-doc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    persist = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "persist";
-        ename = "persist";
-        version = "0.6.1.0.20240615.190609";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240615.190609.tar";
-          sha256 = "0qncm2q42y4xqijx468cpvbh841nw9fk27mm5zdc3l792i0i29y4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/persist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    phpinspect = callPackage ({ compat, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "phpinspect";
-        ename = "phpinspect";
-        version = "0.0.20240322.152749";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar";
-          sha256 = "0060s1p60cqq0llx5m41iwqj1bxl98c444kyhfvdvx3c7z5dapmp";
-        };
-        packageRequires = [ compat ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/phpinspect.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    phps-mode = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "phps-mode";
-        ename = "phps-mode";
-        version = "0.4.49.0.20240424.65247";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/phps-mode-0.4.49.0.20240424.65247.tar";
-          sha256 = "03xz1ig3zsbwixa4hkh7g9ihjxlw2jmzydqldkvjsyv1yhyyf2j4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/phps-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pinentry = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "pinentry";
-        ename = "pinentry";
-        version = "0.1.0.20231126.141402";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar";
-          sha256 = "056h9zfbk4mfpvfpli2kr48i5cdcrf73v15id0dk762iy7iz38af";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pinentry.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "plz";
-        ename = "plz";
-        version = "0.9.0.20240610.142147";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-0.9.0.20240610.142147.tar";
-          sha256 = "1jbm07jw7kw2s57q4d0l6r8zxwjj1mi9kx37ppdqv28dbjmbln1r";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/plz.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    plz-event-source = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib
-                                    , plz }:
-      elpaBuild {
-        pname = "plz-event-source";
-        ename = "plz-event-source";
-        version = "0.1pre0.20240607.160859";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240607.160859.tar";
-          sha256 = "02wv00dij35crkff82plxlkwgninjnllpc44lq0ynxwk1lgx3q5a";
-        };
-        packageRequires = [ emacs plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/plz-event-source.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    plz-media-type = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , plz }:
-      elpaBuild {
-        pname = "plz-media-type";
-        ename = "plz-media-type";
-        version = "0.1pre0.20240607.134302";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240607.134302.tar";
-          sha256 = "1q6a4yyy339l2crc24mssxansmpmhq401h3mcqkzkcw60xh9wsr8";
-        };
-        packageRequires = [ emacs plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/plz-media-type.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
-      elpaBuild {
-        pname = "plz-see";
-        ename = "plz-see";
-        version = "0.1.0.20231101.73512";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar";
-          sha256 = "09ibjvd9wvndrygnfq0jic7m9bk6v490rk1k3b4qjvv5xfvsvvhq";
-        };
-        packageRequires = [ emacs plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/plz-see.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "poke";
-        ename = "poke";
-        version = "3.2.0.20230517.100500";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar";
-          sha256 = "0p12szh563vynl7h9j55v7373g43fhmsy03iibvnywaira4arw5l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/poke.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    poke-mode = callPackage ({ elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "poke-mode";
-        ename = "poke-mode";
-        version = "3.1.0.20231014.222558";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar";
-          sha256 = "1aqw9rn17n7ywnys6dlwykrf63l4kgapqsk1fay5qjj0y1nkq167";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/poke-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    poker = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "poker";
-        ename = "poker";
-        version = "0.2.0.20221221.81510";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/poker-0.2.0.20221221.81510.tar";
-          sha256 = "14xc4jpkpy88drijp19znfhlyv61p2fx2l3zqsqbl3br2xwxy219";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/poker.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    polymode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "polymode";
-        ename = "polymode";
-        version = "0.2.2.0.20230317.121821";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar";
-          sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/polymode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    popper = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "popper";
-        ename = "popper";
-        version = "0.4.6.0.20240701.211603";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar";
-          sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/popper.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    posframe = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "posframe";
-        ename = "posframe";
-        version = "1.4.3.0.20240703.35906";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar";
-          sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/posframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pq = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pq";
-        ename = "pq";
-        version = "0.2.0.20240317.135839";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar";
-          sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pq.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    prefixed-core = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "prefixed-core";
-        ename = "prefixed-core";
-        version = "0.0.20221212.225529";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/prefixed-core-0.0.20221212.225529.tar";
-          sha256 = "1b9bikccig8l96fal97lv6gajjip6qmbkx21y0pndfbw2kaamic4";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/prefixed-core.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    preview-auto = callPackage ({ auctex
-                                , elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "preview-auto";
-        ename = "preview-auto";
-        version = "0.3.0.20240629.205058";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240629.205058.tar";
-          sha256 = "12qmpx9lamxkwkvximygqkczyvwxv6dn8zyv8x55v2qiav0vcp1r";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/preview-auto.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    preview-tailor = callPackage ({ auctex
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "preview-tailor";
-        ename = "preview-tailor";
-        version = "0.2.0.20240617.174356";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20240617.174356.tar";
-          sha256 = "17x74wzfi7kc08x1kwlzvsyiqmimxf77k58amskyg73l1iqmr8s8";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    project = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , xref }:
-      elpaBuild {
-        pname = "project";
-        ename = "project";
-        version = "0.11.1.0.20240614.152748";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240614.152748.tar";
-          sha256 = "0izv7szsi3gqqafdjrqnpy3znsk1izr2zkcyc45jiyv5bafd76ik";
-        };
-        packageRequires = [ emacs xref ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/project.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    psgml = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "psgml";
-        ename = "psgml";
-        version = "1.3.5.0.20221229.184738";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/psgml-1.3.5.0.20221229.184738.tar";
-          sha256 = "1zdfdzbadrbj6g4k2q7w5yvxvblpwn4mkihmnmag7jym66r4wmnb";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/psgml.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "pspp-mode";
-        ename = "pspp-mode";
-        version = "1.1.0.20221221.81719";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pspp-mode-1.1.0.20221221.81719.tar";
-          sha256 = "010qckmc85wc4i7k1rmhffcdbpxpvs6p5qxdvr6g3ws00c1a3j4l";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pulsar";
-        ename = "pulsar";
-        version = "1.0.1.0.20240429.64508";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar";
-          sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pulsar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }:
-      elpaBuild {
-        pname = "pyim";
-        ename = "pyim";
-        version = "5.3.4.0.20240508.25615";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pyim-5.3.4.0.20240508.25615.tar";
-          sha256 = "0p079girx795fvqswdjh8l5mwdyndanfcsvb1qvj2klq063y1vv5";
-        };
-        packageRequires = [ async emacs xr ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pyim.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pyim-basedict = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "pyim-basedict";
-        ename = "pyim-basedict";
-        version = "0.5.4.0.20220614.110824";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar";
-          sha256 = "0md12ysqcmz737vcs8wh561zl8s98w04cgzs69pbdnzzxas7iy2j";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    python = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "python";
-        ename = "python";
-        version = "0.28.0.20240708.74355";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/python-0.28.0.20240708.74355.tar";
-          sha256 = "0q4s3lqifq6nrs9irqz709msja5slw6kc66gigm653m1n9j9kr1i";
-        };
-        packageRequires = [ compat emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/python.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    quarter-plane = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "quarter-plane";
-        ename = "quarter-plane";
-        version = "0.1.0.20221221.81727";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/quarter-plane-0.1.0.20221221.81727.tar";
-          sha256 = "1s0fl9sxjhv0sl5ikvkhdnddjg1n2hzw0a64xcvm8859dk77fmy8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    queue = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "queue";
-        ename = "queue";
-        version = "0.2.0.20210306.173709";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/queue-0.2.0.20210306.173709.tar";
-          sha256 = "09iicl5fdpli6jnvdj0h8cwj7wqqmxnfzdd57vfjdq09v3sjkljs";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/queue.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rainbow-mode = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "rainbow-mode";
-        ename = "rainbow-mode";
-        version = "1.0.6.0.20231215.171141";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar";
-          sha256 = "0qr0yl8fszrrdnl8x3d8lnndr5s9g3bf708qilb3f6i5ahkqhq7l";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rbit = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rbit";
-        ename = "rbit";
-        version = "0.1.0.20201128.182847";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rbit-0.1.0.20201128.182847.tar";
-          sha256 = "1ajjfkih0dji2mdsvcpdzmb32nv20niryl8x17ki1016302qfvdj";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rbit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rcirc-color = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "rcirc-color";
-        ename = "rcirc-color";
-        version = "0.4.5.0.20230414.195045";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar";
-          sha256 = "1amlzg7njbmk1kbb569ygx2az7vd7py89z9aq9cmf5rm15hjsm59";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rcirc-menu = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "rcirc-menu";
-        ename = "rcirc-menu";
-        version = "1.1.0.20221221.81818";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rcirc-menu-1.1.0.20221221.81818.tar";
-          sha256 = "0gd19rzqgqb9w5cfpr1rz719k5z1rfkn8480b0h1zkvgpgmdrzbx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rcirc-sqlite = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "rcirc-sqlite";
-        ename = "rcirc-sqlite";
-        version = "1.0.2.0.20240606.194313";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar";
-          sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , load-relative
-                           , loc-changes
-                           , test-simple }:
-      elpaBuild {
-        pname = "realgud";
-        ename = "realgud";
-        version = "1.5.1.0.20231113.141045";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar";
-          sha256 = "1nvmpbnx31fdi2ps243xx6cnvhmyv9n1kvb98ydnxydmalxs4iva";
-        };
-        packageRequires = [ emacs load-relative loc-changes test-simple ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-ipdb = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib
-                                , load-relative
-                                , realgud }:
-      elpaBuild {
-        pname = "realgud-ipdb";
-        ename = "realgud-ipdb";
-        version = "1.0.0.0.20231216.160636";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20231216.160636.tar";
-          sha256 = "1s08gngzq18bgxdc6qpsg7j9wjqq842wj5bki2l8jgyqpin6g3h5";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-jdb = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib
-                               , load-relative
-                               , realgud }:
-      elpaBuild {
-        pname = "realgud-jdb";
-        ename = "realgud-jdb";
-        version = "1.0.0.0.20200722.72030";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-jdb-1.0.0.0.20200722.72030.tar";
-          sha256 = "1vh4x50gcy5i9v9pisn0swmv0ighksn8ni68pdwxkns5ka99qqi6";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-lldb = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib
-                                , load-relative
-                                , realgud }:
-      elpaBuild {
-        pname = "realgud-lldb";
-        ename = "realgud-lldb";
-        version = "1.0.2.0.20230319.171320";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar";
-          sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-node-debug = callPackage ({ cl-lib ? null
-                                      , elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , load-relative
-                                      , realgud }:
-      elpaBuild {
-        pname = "realgud-node-debug";
-        ename = "realgud-node-debug";
-        version = "1.0.0.0.20190525.123417";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-node-debug-1.0.0.0.20190525.123417.tar";
-          sha256 = "1s5zav3d0xdj0jggw3znfzb43d9jrnzaafk51wiachh7j673gjjv";
-        };
-        packageRequires = [ cl-lib emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-node-inspect = callPackage ({ cl-lib ? null
-                                        , elpaBuild
-                                        , emacs
-                                        , fetchurl
-                                        , lib
-                                        , load-relative
-                                        , realgud }:
-      elpaBuild {
-        pname = "realgud-node-inspect";
-        ename = "realgud-node-inspect";
-        version = "1.0.0.0.20190526.154549";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-node-inspect-1.0.0.0.20190526.154549.tar";
-          sha256 = "0hss16d3avyisdxp1xhzjqn2kd9xc3vkqg4ynsgvxampzli78fw9";
-        };
-        packageRequires = [ cl-lib emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-trepan-ni = callPackage ({ elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib
-                                     , load-relative
-                                     , realgud }:
-      elpaBuild {
-        pname = "realgud-trepan-ni";
-        ename = "realgud-trepan-ni";
-        version = "1.0.1.0.20210513.183733";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-trepan-ni-1.0.1.0.20210513.183733.tar";
-          sha256 = "0p7sc7g1nwg1hyvgx5mzs2qpjnrayp7brw720kzxfxnxdfj7p0gj";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-trepan-xpy = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , load-relative
-                                      , realgud }:
-      elpaBuild {
-        pname = "realgud-trepan-xpy";
-        ename = "realgud-trepan-xpy";
-        version = "1.0.1.0.20230322.184556";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/realgud-trepan-xpy-1.0.1.0.20230322.184556.tar";
-          sha256 = "0m9pwqbkhwkm9fys7rs2lapydkinh4v7q3q3j8b0qb0nl8qcni7i";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rec-mode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "rec-mode";
-        ename = "rec-mode";
-        version = "1.9.3.0.20231120.221944";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar";
-          sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rec-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    register-list = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "register-list";
-        ename = "register-list";
-        version = "0.1.0.20221212.230034";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/register-list-0.1.0.20221212.230034.tar";
-          sha256 = "02qc5ll26br1smx5d0ci3wm0s4hdj8sw72xdapn5bql5509n75dx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/register-list.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }:
-      elpaBuild {
-        pname = "relint";
-        ename = "relint";
-        version = "1.24.0.20240510.91500";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/relint-1.24.0.20240510.91500.tar";
-          sha256 = "171dnhya0ij5lapn9h2d8ssxx163lwgasvfssd07739171h07389";
-        };
-        packageRequires = [ emacs xr ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/relint.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    repology = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "repology";
-        ename = "repology";
-        version = "1.2.4.0.20240108.130348";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar";
-          sha256 = "1ybr0zn647sb6gfqrm6ahdkx3q30j2b0gaab335nkc7jqx1ba565";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/repology.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rich-minority = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "rich-minority";
-        ename = "rich-minority";
-        version = "1.0.3.0.20190419.83620";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar";
-          sha256 = "0kx516s0kv8ni3w408hb9bpnig83bv4m1l7b5lhdigmp8zvqm8jm";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rich-minority.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rnc-mode";
-        ename = "rnc-mode";
-        version = "0.3.0.20221221.81910";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar";
-          sha256 = "1rdz1g440sjzxcqc4p2s0vv525ala4k470ddn4h9ghljnncqbady";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rt-liberation = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "rt-liberation";
-        ename = "rt-liberation";
-        version = "7.0.20240306.83828";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar";
-          sha256 = "1gz0hiwl8qqf1adxwgr8ly98pymqjrl3jjfly5r182l3rwp82gsh";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ruby-end = callPackage ({ elpaBuild
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "ruby-end";
-        ename = "ruby-end";
-        version = "0.4.3.0.20230205.12506";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ruby-end-0.4.3.0.20230205.12506.tar";
-          sha256 = "0cr18s311c986gwx12f6fmnqwyqb4fh7j6h8m2cgp767vn4aqwxl";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ruby-end.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rudel = callPackage ({ cl-generic
-                         , cl-lib ? null
-                         , cl-print ? null
-                         , elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib }:
-      elpaBuild {
-        pname = "rudel";
-        ename = "rudel";
-        version = "0.3.2.0.20221212.230154";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rudel-0.3.2.0.20221212.230154.tar";
-          sha256 = "0lcdc0gdqkl4disr9rwn1dmziwaiwnsyhfwvf02vrgpabd7dq95w";
-        };
-        packageRequires = [ cl-generic cl-lib cl-print emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rudel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "satchel";
-        ename = "satchel";
-        version = "0.2.0.20220223.202624";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar";
-          sha256 = "1x558csdfahlp459m4bb827yayrzgisaijzbpxbl1pjhq595585d";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/satchel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "scanner";
-        ename = "scanner";
-        version = "0.2.0.20210104.105054";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar";
-          sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scanner.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scroll-restore = callPackage ({ elpaBuild
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "scroll-restore";
-        ename = "scroll-restore";
-        version = "1.0.0.20221221.81959";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/scroll-restore-1.0.0.20221221.81959.tar";
-          sha256 = "04xhshjm5fr5q85srmjhvm20l0zljgbdsy1f3g3lczgzqrwvyg9f";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sed-mode";
-        ename = "sed-mode";
-        version = "1.1.0.20230721.154631";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sed-mode-1.1.0.20230721.154631.tar";
-          sha256 = "1gb7m8w5v0ay8mcm7alyixsnmndivd24467v58rkj0bpf7bmfa5v";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sed-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    seq = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "seq";
-        ename = "seq";
-        version = "2.24.0.20240201.135317";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/seq-2.24.0.20240201.135317.tar";
-          sha256 = "0plr9pbvzd5cfivj90n0jm920hp2x1giy9889pr8x5bqqnba6j66";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/seq.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "setup";
-        ename = "setup";
-        version = "1.4.0.0.20240413.75454";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar";
-          sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/setup.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shelisp = callPackage ({ elpaBuild
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "shelisp";
-        ename = "shelisp";
-        version = "1.0.0.0.20221212.230255";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/shelisp-1.0.0.0.20221212.230255.tar";
-          sha256 = "0kk24mkmm4imf7gsr7xihj3xf2y9mgy61gpyql0wms1vlmkl0mwk";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shelisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shell-command-plus = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "shell-command-plus";
-        ename = "shell-command+";
-        version = "2.4.2.0.20240712.91350";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240712.91350.tar";
-          sha256 = "11qma2a8cph3q87bma8jwb8q4vfqdqs7gmb88yw8ywil76p6jdms";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shell-quasiquote = callPackage ({ elpaBuild
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "shell-quasiquote";
-        ename = "shell-quasiquote";
-        version = "0.0.20221221.82030";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar";
-          sha256 = "0g2yq64yyim35lvxify65kq3y49qrvgri7jyl9rgz8999gb3h8dj";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shell-quasiquote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "shen-mode";
-        ename = "shen-mode";
-        version = "0.1.0.20221221.82050";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/shen-mode-0.1.0.20221221.82050.tar";
-          sha256 = "17ygb1c0x52n3cnmvaacrcf7m6qdjxdqaw1pn7lg3899kl45dh3r";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shen-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sisu-mode = callPackage ({ elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "sisu-mode";
-        ename = "sisu-mode";
-        version = "7.1.8.0.20221221.82114";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sisu-mode-7.1.8.0.20221221.82114.tar";
-          sha256 = "1cyynn3sk8wxfhiz5q0lqwq07kqy67s2rvjql62880in5m5r2jpa";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    site-lisp = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "site-lisp";
-        ename = "site-lisp";
-        version = "0.1.2.0.20240308.82403";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar";
-          sha256 = "0c9r5pp2lr4wmpcfa8qz0xvq1vhzyhvnn14kawjarhx9p5mvgdq1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/site-lisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sketch-mode = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "sketch-mode";
-        ename = "sketch-mode";
-        version = "1.0.4.0.20230420.122954";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sketch-mode-1.0.4.0.20230420.122954.tar";
-          sha256 = "0ssh1v49h94gvchpynvjcsw80swpcdw541zxxhxm5zi6gsnyhnjd";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    slime-volleyball = callPackage ({ cl-lib ? null
-                                    , elpaBuild
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "slime-volleyball";
-        ename = "slime-volleyball";
-        version = "1.2.0.0.20221221.82156";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/slime-volleyball-1.2.0.0.20221221.82156.tar";
-          sha256 = "015qpac86km7czpqr2f7xpjlkwbq9s4z9jl0dnr8b2bzh0iwqiik";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sm-c-mode";
-        ename = "sm-c-mode";
-        version = "1.2.0.20240404.93144";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sm-c-mode-1.2.0.20240404.93144.tar";
-          sha256 = "1xbkdvhxaffk6csav2ivbrqv85rkb4arnsslp2ji13alkm5hx1zx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smalltalk-mode = callPackage ({ elpaBuild
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "smalltalk-mode";
-        ename = "smalltalk-mode";
-        version = "4.0.0.20221221.82225";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/smalltalk-mode-4.0.0.20221221.82225.tar";
-          sha256 = "1qk0z1gddw7fidvj429ivjwnxb4f5g074r531nmpvmy2l7srchd9";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smart-yank = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "smart-yank";
-        ename = "smart-yank";
-        version = "0.1.1.0.20221221.82231";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar";
-          sha256 = "17w9ybfvdsnsy1vf1mg7a4428rna49i2yfifrp20srj8c0dapwzd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/smart-yank.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sml-mode";
-        ename = "sml-mode";
-        version = "6.12.0.20230411.5343";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar";
-          sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sml-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "so-long";
-        ename = "so-long";
-        version = "1.1.2.0.20240102.22814";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar";
-          sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/so-long.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    soap-client = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "soap-client";
-        ename = "soap-client";
-        version = "3.2.3.0.20240102.22814";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar";
-          sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/soap-client.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sokoban = callPackage ({ cl-lib ? null
-                           , elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "sokoban";
-        ename = "sokoban";
-        version = "1.4.9.0.20220928.185052";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar";
-          sha256 = "1d3s1v81mvfjcq5bbf0338ldxgl2rymqb3vqqw7drbics4jq5fc0";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sokoban.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sotlisp";
-        ename = "sotlisp";
-        version = "1.6.2.0.20220909.50328";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar";
-          sha256 = "1g48ahiwdipk4ckynqipsfradd1qafg59s10jkbpkp3wvfmxi5sf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sotlisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    spacious-padding = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "spacious-padding";
-        ename = "spacious-padding";
-        version = "0.5.0.0.20240429.82953";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240429.82953.tar";
-          sha256 = "0k5w5d9prlasvv6074nxl8782mbhhvccpkc1zjrp228frkbgfpmi";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "spinner";
-        ename = "spinner";
-        version = "1.7.4.0.20220915.94959";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar";
-          sha256 = "1110bxj7vgai0wgsqbd9917k72xmalyfy0rlwqp46azg02ljam6j";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/spinner.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-beeline = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "sql-beeline";
-        ename = "sql-beeline";
-        version = "0.2.0.20221221.82329";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sql-beeline-0.2.0.20221221.82329.tar";
-          sha256 = "0qfw9q5isyjywlm2fyaazci24jza6h4s50i0zmjk35j6spyxwffs";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-cassandra = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "sql-cassandra";
-        ename = "sql-cassandra";
-        version = "0.2.2.0.20221221.82336";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar";
-          sha256 = "1rl2bdjyglzssm00zdfqidd9j7jzizxaq60bclqa5dsz80zsd6aq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-indent = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "sql-indent";
-        ename = "sql-indent";
-        version = "1.7.0.20240323.40057";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar";
-          sha256 = "0zrsglgw2zjxn9810r022kanvfj0zrhvr696yxlnvd05f9hv9bpp";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-indent.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-smie = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sql-smie";
-        ename = "sql-smie";
-        version = "0.0.20221221.82351";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sql-smie-0.0.20221221.82351.tar";
-          sha256 = "05jv2k9gswwwyi19da8d5f176lb81qmnf94dvghyzh272v9iwvkr";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-smie.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz, transient }:
-      elpaBuild {
-        pname = "srht";
-        ename = "srht";
-        version = "0.4.0.20240506.104337";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/srht-0.4.0.20240506.104337.tar";
-          sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0";
-        };
-        packageRequires = [ emacs plz transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/srht.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ssh-deploy = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "ssh-deploy";
-        ename = "ssh-deploy";
-        version = "3.1.16.0.20230702.92809";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar";
-          sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    standard-themes = callPackage ({ elpaBuild
-                                   , emacs
-                                   , fetchurl
-                                   , lib }:
-      elpaBuild {
-        pname = "standard-themes";
-        ename = "standard-themes";
-        version = "2.0.1.0.20240520.83250";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240520.83250.tar";
-          sha256 = "08lb47hilg5dniqxlxp773s16m0shqmglcrf1qdm48ddg05911gx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/standard-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "stream";
-        ename = "stream";
-        version = "2.3.0.0.20230908.74447";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar";
-          sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/stream.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    substitute = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "substitute";
-        ename = "substitute";
-        version = "0.3.1.0.20240522.34122";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar";
-          sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/substitute.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "svg";
-        ename = "svg";
-        version = "1.1.0.20240102.22814";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/svg-1.1.0.20240102.22814.tar";
-          sha256 = "1ddz3zadwmm4am2ywwmrqj2a56kr73i45q7svjmgnljgvvs267b3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
-      elpaBuild {
-        pname = "svg-clock";
-        ename = "svg-clock";
-        version = "1.2.0.20221221.82408";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar";
-          sha256 = "15fshgjqv3995f2339rwvjw9vyiqz2lfs9h80gkmssha7fdfw3qx";
-        };
-        packageRequires = [ emacs svg ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg-clock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "svg-lib";
-        ename = "svg-lib";
-        version = "0.3.0.20240219.161327";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240219.161327.tar";
-          sha256 = "1qycnhjinmn1smajsniz34kv7jkl4gycjhsl6mxxjhq0432cw2fc";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg-lib.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg-tag-mode = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib
-                                , svg-lib }:
-      elpaBuild {
-        pname = "svg-tag-mode";
-        ename = "svg-tag-mode";
-        version = "0.3.2.0.20240624.85758";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar";
-          sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln";
-        };
-        packageRequires = [ emacs svg-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    swiper = callPackage ({ elpaBuild
-                          , emacs
-                          , fetchurl
-                          , ivy
-                          , lib }:
-      elpaBuild {
-        pname = "swiper";
-        ename = "swiper";
-        version = "0.14.2.0.20240520.120545";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar";
-          sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma";
-        };
-        packageRequires = [ emacs ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/swiper.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    switchy-window = callPackage ({ compat
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "switchy-window";
-        ename = "switchy-window";
-        version = "1.3.0.20230411.180529";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar";
-          sha256 = "1h3jib0qr8wj3xk3qha5yrw2vqhidnqhj4jhw2smrfk61vyfs83b";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/switchy-window.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sxhkdrc-mode = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "sxhkdrc-mode";
-        ename = "sxhkdrc-mode";
-        version = "1.0.0.0.20240117.30132";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar";
-          sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    system-packages = callPackage ({ elpaBuild
-                                   , emacs
-                                   , fetchurl
-                                   , lib }:
-      elpaBuild {
-        pname = "system-packages";
-        ename = "system-packages";
-        version = "1.0.13.0.20230908.453";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/system-packages-1.0.13.0.20230908.453.tar";
-          sha256 = "0qh4z6sik94hkms5nfharx2y8np2a1a2r9yrf8lw6xihdnd7bfcv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/system-packages.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    systemd = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "systemd";
-        ename = "systemd";
-        version = "0.0.20221221.82418";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/systemd-0.0.20221221.82418.tar";
-          sha256 = "1ir3y4w2x1cl24zy66yym5rlpffgrcs10x4sxhb2sgg5k4d88scn";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/systemd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tNFA = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }:
-      elpaBuild {
-        pname = "tNFA";
-        ename = "tNFA";
-        version = "0.1.1.0.20240405.140856";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20240405.140856.tar";
-          sha256 = "0m2lh50bz56j5gdpjvan0sksgnlb3cszb28q69xni88hajacn4aw";
-        };
-        packageRequires = [ cl-lib queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tNFA.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tam = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tam";
-        ename = "tam";
-        version = "0.1.0.20230920.103516";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar";
-          sha256 = "01w1vwb1ajmbk90c79wc0dc367sy5b5qdf471zr0xinajfv47709";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tam.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "taxy";
-        ename = "taxy";
-        version = "0.10.1.0.20220919.160646";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/taxy-0.10.1.0.20220919.160646.tar";
-          sha256 = "0bld0sjni4ipbllrjnlwk5419454ac5s3mf6imw91z4ddk46vp18";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/taxy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    taxy-magit-section = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , magit-section
-                                      , taxy }:
-      elpaBuild {
-        pname = "taxy-magit-section";
-        ename = "taxy-magit-section";
-        version = "0.14pre0.20240703.212805";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14pre0.20240703.212805.tar";
-          sha256 = "0sdjfryyg0lgr8mry0v662j9m3kaqcap6f73s4ds81yc67y30qbg";
-        };
-        packageRequires = [ emacs magit-section taxy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    temp-buffer-browse = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "temp-buffer-browse";
-        ename = "temp-buffer-browse";
-        version = "1.5.0.20160804.124501";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar";
-          sha256 = "0jw3fjbnbbrsz54hmg4rhcwrl0ag7h6873n2kdph3gjds29d8jxp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tempel";
-        ename = "tempel";
-        version = "1.1.0.20240708.212025";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240708.212025.tar";
-          sha256 = "0jlqq91w8rwqkd6knqlpw9218xqblfqw253406q4an820rxkzx7l";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tempel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    test-simple = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "test-simple";
-        ename = "test-simple";
-        version = "1.3.0.0.20230916.123447";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20230916.123447.tar";
-          sha256 = "1xbf63qg17va0qwq2mkg12jg1fk6wwrs43jjzxxccx28h6d205il";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/test-simple.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tex-item = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tex-item";
-        ename = "tex-item";
-        version = "0.1.0.20240617.174820";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tex-item-0.1.0.20240617.174820.tar";
-          sha256 = "17b95npakxjzc03qrsxla5jhdzhq0clwdrx57f9ck94a0fnpji3x";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tex-item.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tex-parens = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "tex-parens";
-        ename = "tex-parens";
-        version = "0.4.0.20240630.70456";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tex-parens-0.4.0.20240630.70456.tar";
-          sha256 = "0rz6qmmmfajndq3irvrfvmjp1l3j0cfkz5fp36nabyrpj0v8g821";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tex-parens.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    theme-buffet = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "theme-buffet";
-        ename = "theme-buffet";
-        version = "0.1.2.0.20240105.165329";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar";
-          sha256 = "1p1vmyl2cdm6vk45884jhrxjgd53mdch4wfkd1hx269v76zl58pa";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/theme-buffet.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    timerfunctions = callPackage ({ cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "timerfunctions";
-        ename = "timerfunctions";
-        version = "1.4.2.0.20221221.82440";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar";
-          sha256 = "08spli0dfi882wrjcxjgk3zl4g4b5rlrvpyjmkgkzq6ix5z7w80j";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tiny = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "tiny";
-        ename = "tiny";
-        version = "0.2.1.0.20220910.192941";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tiny-0.2.1.0.20220910.192941.tar";
-          sha256 = "04ybgq2ppzjpindwgypsp4sb0hmzq5k7sg9niyp18dxkj0nv1l7n";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tiny.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tmr = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tmr";
-        ename = "tmr";
-        version = "0.4.0.0.20240117.30342";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar";
-          sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tmr.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }:
-      elpaBuild {
-        pname = "tomelr";
-        ename = "tomelr";
-        version = "0.4.3.0.20220511.213722";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tomelr-0.4.3.0.20220511.213722.tar";
-          sha256 = "0vjhbz8lfhk84kgm8vd9lfn9qx60g40j7n3kx7iadk0p4842fpaa";
-        };
-        packageRequires = [ emacs map seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tomelr.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    topspace = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "topspace";
-        ename = "topspace";
-        version = "0.3.1.0.20230106.94110";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar";
-          sha256 = "179k6d4v4lw66gpb2lmf1zcz6ww1fr3ys0x992wd1r7mvlc070s8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/topspace.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    track-changes = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "track-changes";
-        ename = "track-changes";
-        version = "1.2.0.20240604.221628";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar";
-          sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/track-changes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tramp";
-        ename = "tramp";
-        version = "2.7.1.0.20240629.82953";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tramp-2.7.1.0.20240629.82953.tar";
-          sha256 = "0kf7l5v84hqhbxzvg6xmffs8b03shd6062wjxfxy9z8y9xb6zpar";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tramp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tramp-nspawn = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "tramp-nspawn";
-        ename = "tramp-nspawn";
-        version = "1.0.1.0.20220923.120957";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar";
-          sha256 = "0mpr7d5vgfwsafbmj8lqc1k563b7qnjz1zq73rl8rb2km5jxczhn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tramp-theme = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "tramp-theme";
-        ename = "tramp-theme";
-        version = "0.2.0.20221221.82451";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar";
-          sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    transcribe = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "transcribe";
-        ename = "transcribe";
-        version = "1.5.2.0.20221221.82457";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/transcribe-1.5.2.0.20221221.82457.tar";
-          sha256 = "12xw9vxzqfr3pis49apdzc5bg0n30wfx0xa9kycdbcpda88f3z6h";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/transcribe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    transient = callPackage ({ compat
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , seq }:
-      elpaBuild {
-        pname = "transient";
-        ename = "transient";
-        version = "0.7.2.0.20240629.150812";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/transient-0.7.2.0.20240629.150812.tar";
-          sha256 = "02d73zfxcbk2p5pzs5j2hv0qznj2zbjyjd6xhinpxx657w1c3zsx";
-        };
-        packageRequires = [ compat emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/transient.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    transient-cycles = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "transient-cycles";
-        ename = "transient-cycles";
-        version = "1.0.0.20220410.130412";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar";
-          sha256 = "1rmgmlbjig866gr5jr89mv8ikvpf0p0pcgpa236nmiw3j6jsywa8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tree-inspector = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , treeview }:
-      elpaBuild {
-        pname = "tree-inspector";
-        ename = "tree-inspector";
-        version = "0.4.0.20240322.113138";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar";
-          sha256 = "15k30zdbr8cr88z00dn2jfnybrhkmp769pc361v9n4mdgapwmiap";
-        };
-        packageRequires = [ emacs treeview ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }:
-      elpaBuild {
-        pname = "trie";
-        ename = "trie";
-        version = "0.6.0.20231015.13107";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/trie-0.6.0.20231015.13107.tar";
-          sha256 = "0kwz7b7y90yq676r09h4w0wbrm61030sw6mqhrcq9130s107lbkx";
-        };
-        packageRequires = [ heap tNFA ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/trie.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    triples = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , seq }:
-      elpaBuild {
-        pname = "triples";
-        ename = "triples";
-        version = "0.3.5.0.20240201.233852";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar";
-          sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/triples.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    typo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "typo";
-        ename = "typo";
-        version = "1.0.1.0.20230730.150555";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar";
-          sha256 = "0cjn2lh0949kc6c9fxknzg2fyb4p3iwic2a9md5yxpdl42j24fvw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/typo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ulisp-repl = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "ulisp-repl";
-        ename = "ulisp-repl";
-        version = "1.0.3.0.20230604.111559";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar";
-          sha256 = "0b6yvlwikgkkfqklrhbcs0p6y349b6700x78n77xf0kkgv7mca1i";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    undo-tree = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , queue }:
-      elpaBuild {
-        pname = "undo-tree";
-        ename = "undo-tree";
-        version = "0.8.2.0.20220312.180415";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar";
-          sha256 = "1gm5108p4qv7v4dqpxkd3zb2h5w8nsz0xjbxzxpkvykqp982g030";
-        };
-        packageRequires = [ emacs queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/undo-tree.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    uni-confusables = callPackage ({ elpaBuild
-                                   , fetchurl
-                                   , lib }:
-      elpaBuild {
-        pname = "uni-confusables";
-        ename = "uni-confusables";
-        version = "0.3.0.20221212.230830";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/uni-confusables-0.3.0.20221212.230830.tar";
-          sha256 = "15kc12zih2d6lazcqgiaq9jc5zgznnhaywh7ibflwc6siqvwxzvg";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    uniquify-files = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "uniquify-files";
-        ename = "uniquify-files";
-        version = "1.0.4.0.20221221.82507";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar";
-          sha256 = "0zn7z3y7f7hw4144ssa398455091qrg238wp9fr53l2rxpdkdkwf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    urgrep = callPackage ({ compat
-                          , elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , project }:
-      elpaBuild {
-        pname = "urgrep";
-        ename = "urgrep";
-        version = "0.5.1snapshot0.20240530.111648";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240530.111648.tar";
-          sha256 = "160h7jzbkf1igaz49sp9gw30471qmw9b28h2pq9r8f1varkvy9an";
-        };
-        packageRequires = [ compat emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/urgrep.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    url-http-ntlm = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , fetchurl
-                                 , lib
-                                 , nadvice
-                                 , ntlm ? null }:
-      elpaBuild {
-        pname = "url-http-ntlm";
-        ename = "url-http-ntlm";
-        version = "2.0.5.0.20231024.31412";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar";
-          sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd";
-        };
-        packageRequires = [ cl-lib nadvice ntlm ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    url-http-oauth = callPackage ({ elpaBuild
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "url-http-oauth";
-        ename = "url-http-oauth";
-        version = "0.8.3.0.20230510.175959";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar";
-          sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/url-http-oauth.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "url-scgi";
-        ename = "url-scgi";
-        version = "0.9.0.20231222.161107";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar";
-          sha256 = "1dgi0r0igwsk3mx6b7mvd6xz7dmb545g2394s0wh9kkjhlkyd5b3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/url-scgi.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    use-package = callPackage ({ bind-key
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "use-package";
-        ename = "use-package";
-        version = "2.4.5.0.20240708.120317";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240708.120317.tar";
-          sha256 = "1kp1mh2hm6yhwchkr1vxpnnajdc378knwkmf88vky2ygnnscczy7";
-        };
-        packageRequires = [ bind-key emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/use-package.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    validate = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , seq }:
-      elpaBuild {
-        pname = "validate";
-        ename = "validate";
-        version = "1.0.4.0.20180215.204244";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/validate-1.0.4.0.20180215.204244.tar";
-          sha256 = "1hayzx6x2xqfzg84ik5n5x84ixmwc0kc8h7f0796d4rfiljl4y3c";
-        };
-        packageRequires = [ cl-lib emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/validate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "valign";
-        ename = "valign";
-        version = "3.1.1.0.20210501.211155";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar";
-          sha256 = "1w5by0y4552c2qlm708b3523fp9sgizd0zxrwk2k1v6qwh04pa67";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/valign.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-backup = callPackage ({ compat
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "vc-backup";
-        ename = "vc-backup";
-        version = "1.1.0.0.20220825.144758";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar";
-          sha256 = "1jd3mv5467vy3ddrrhsv6nwsmyksqls5zhnb8hjb6imrhsylprbv";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-backup.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vc-got";
-        ename = "vc-got";
-        version = "1.2.0.20230129.104658";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar";
-          sha256 = "0dwigmr1rm8a80ngx25jrqlgnbdj51db6avmyg3v7avhkyg5x455";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-got.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-hgcmd = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "vc-hgcmd";
-        ename = "vc-hgcmd";
-        version = "1.14.1.0.20230605.161947";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar";
-          sha256 = "1qrrbr7qgbsc00mrbslaa0k6n3dnighw5dq3mx1hlgz0flm623gi";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vcard";
-        ename = "vcard";
-        version = "0.2.2.0.20230718.145809";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar";
-          sha256 = "14rc6glk0wyfjymiv2h5db0cxpl7j8i7h3xlm5bhvgiab00vhk6x";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vcard.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "vcl-mode";
-        ename = "vcl-mode";
-        version = "1.1.0.20201127.191542";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vcl-mode-1.1.0.20201127.191542.tar";
-          sha256 = "1fjf37s5yfivjbagw7m83y7z5i3dfzqnhcaga7r092v9jvkabw51";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
-      elpaBuild {
-        pname = "vdiff";
-        ename = "vdiff";
-        version = "0.2.4.0.20230620.220116";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar";
-          sha256 = "1974s441i7hvz6jly2xzndrfpp94nidhkb6gjgfk9f5lml1z17n1";
-        };
-        packageRequires = [ emacs hydra ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vdiff.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    verilog-mode = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "verilog-mode";
-        ename = "verilog-mode";
-        version = "2024.3.1.121933719.0.20240707.154630";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240707.154630.tar";
-          sha256 = "1sh1piff0jiahn7w9i607l6j28g74ysylr3n7xrp59nh07y2br6b";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/verilog-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vertico";
-        ename = "vertico";
-        version = "1.8.0.20240711.185118";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240711.185118.tar";
-          sha256 = "1wsybijh4h46swlxx7viz0wiwh5hbkh4q3a51r60flvys90cjkgz";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vertico.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vertico-posframe = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib
-                                    , posframe
-                                    , vertico }:
-      elpaBuild {
-        pname = "vertico-posframe";
-        ename = "vertico-posframe";
-        version = "0.7.7.0.20240202.84736";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar";
-          sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k";
-        };
-        packageRequires = [ emacs posframe vertico ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vertico-posframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vigenere";
-        ename = "vigenere";
-        version = "1.0.0.20221221.82600";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar";
-          sha256 = "03zkmvx6cs5s0plbafb40pxs0rqx1vz12ql03zlx21h0zwgynqwf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vigenere.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    visual-filename-abbrev = callPackage ({ elpaBuild
-                                          , emacs
-                                          , fetchurl
-                                          , lib }:
-      elpaBuild {
-        pname = "visual-filename-abbrev";
-        ename = "visual-filename-abbrev";
-        version = "1.2.0.20221221.82606";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.2.0.20221221.82606.tar";
-          sha256 = "1lb02jpljj2l1qkmn2pmbvw910nrpg9bsz6yfqfccyppvnmrv788";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    visual-fill = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "visual-fill";
-        ename = "visual-fill";
-        version = "0.2.0.20240424.95324";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/visual-fill-0.2.0.20240424.95324.tar";
-          sha256 = "1vgfa29gl4rh6gx08r1imlabznrlmx21p41ns62w9lxi6y8hzf8y";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/visual-fill.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vlf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vlf";
-        ename = "vlf";
-        version = "1.7.2.0.20231016.224412";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar";
-          sha256 = "1smcw9x38cl7pnxdzy8ycx6g80yb5k0qd7x1520wzbp1g31dsar1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vlf.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vundo";
-        ename = "vundo";
-        version = "2.3.0.0.20240425.211317";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar";
-          sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vundo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wcheck-mode = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "wcheck-mode";
-        ename = "wcheck-mode";
-        version = "2021.0.20220101.81620";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20220101.81620.tar";
-          sha256 = "15785pi3fgfdi3adsa4lhsbdqw6bnfcm44apxpfixqfx56d3xh8m";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "wconf";
-        ename = "wconf";
-        version = "0.2.1.0.20201202.220257";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar";
-          sha256 = "0nnf2jak4hjzj2m2v44ymnyvsgiyzz49nnz48j3cpiw7vpb79ibh";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wconf.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    web-server = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "web-server";
-        ename = "web-server";
-        version = "0.1.2.0.20210811.22503";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar";
-          sha256 = "1d2ij23gswvg41xgdg51m2prqn1f9lcwb2rb9rh3s9p6skj14y9b";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/web-server.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    webfeeder = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "webfeeder";
-        ename = "webfeeder";
-        version = "1.1.2.0.20210605.74155";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar";
-          sha256 = "1xcaycimshijmyq071i5qch3idjfl3g4sws9ig97a9hx3m5wfi53";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/webfeeder.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    websocket = callPackage ({ cl-lib ? null
-                             , elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "websocket";
-        ename = "websocket";
-        version = "1.15.0.20230808.230535";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/websocket-1.15.0.20230808.230535.tar";
-          sha256 = "15xry8bv9vcc470j3an5ks9z2hg7ia4nl7x4xvqb77rpbkq53rb9";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/websocket.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    which-key = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "which-key";
-        ename = "which-key";
-        version = "3.6.0.0.20240625.112213";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240625.112213.tar";
-          sha256 = "1shjn6bqnwr8fxccfz86dpwvyqw0crmrn7pb60dwvvjmxqfm0aj6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/which-key.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    window-commander = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "window-commander";
-        ename = "window-commander";
-        version = "3.0.2.0.20240314.125442";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar";
-          sha256 = "082fwi8basfddwvi5yjgvdbf0f7xh58kmbvshnpim143pyxzgi9q";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/window-commander.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    window-tool-bar = callPackage ({ compat
-                                   , elpaBuild
-                                   , emacs
-                                   , fetchurl
-                                   , lib }:
-      elpaBuild {
-        pname = "window-tool-bar";
-        ename = "window-tool-bar";
-        version = "0.2.1.0.20240609.122134";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20240609.122134.tar";
-          sha256 = "1xfwirfdy69c349052jx31c3ib708mwl68458lj8dar5y2cqwk0q";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    windower = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib }:
-      elpaBuild {
-        pname = "windower";
-        ename = "windower";
-        version = "0.0.1.0.20200212.91532";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar";
-          sha256 = "1s9kq9256x8chayqfcczxfcdb67pk6752xg7v6ixb9f3ad590ls2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/windower.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    windresize = callPackage ({ elpaBuild
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "windresize";
-        ename = "windresize";
-        version = "0.1.0.20221221.82616";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/windresize-0.1.0.20221221.82616.tar";
-          sha256 = "0hgfyhz3jx4yhxspvh8zb4s852j8iwijrg7d4madr1p9rm2g3pjq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/windresize.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wisi = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "wisi";
-        ename = "wisi";
-        version = "4.3.2.0.20240313.173240";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar";
-          sha256 = "01i5r77ndxy76gby6v4j25w4pf6kmqaxagya29b9gnrnw07m8n5b";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wisi.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wisitoken-grammar-mode = callPackage ({ elpaBuild
-                                          , emacs
-                                          , fetchurl
-                                          , lib
-                                          , mmm-mode
-                                          , wisi }:
-      elpaBuild {
-        pname = "wisitoken-grammar-mode";
-        ename = "wisitoken-grammar-mode";
-        version = "1.3.0.0.20231023.83923";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar";
-          sha256 = "0ai5s1sgy0wk8hc84w7da65p30ldk514n2h6hqa71f9ia5jbd0j8";
-        };
-        packageRequires = [ emacs mmm-mode wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "wpuzzle";
-        ename = "wpuzzle";
-        version = "1.1.0.20221221.82918";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/wpuzzle-1.1.0.20221221.82918.tar";
-          sha256 = "0ky8n0xjxsw4a684g3l8imbrfsvbc9nq1i8gi1y384qjvvjqxaxv";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wrap-search = callPackage ({ elpaBuild
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "wrap-search";
-        ename = "wrap-search";
-        version = "4.16.13.0.20240517.214404";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/wrap-search-4.16.13.0.20240517.214404.tar";
-          sha256 = "14rk7gyab0m19z0rhrpqcfdqrdrbz9v5zw36rkn5qxzrpv6cw7hq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wrap-search.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xclip = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "xclip";
-        ename = "xclip";
-        version = "1.11.0.20221221.82941";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar";
-          sha256 = "18l69h1vg98fd35hsbbzdlhgmilyj192g9vr34kkwzj0r6bak4l2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xclip.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xeft";
-        ename = "xeft";
-        version = "3.3.0.20230913.220528";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar";
-          sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xeft.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xelb = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xelb";
-        ename = "xelb";
-        version = "0.20.0.20240708.212415";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xelb-0.20.0.20240708.212415.tar";
-          sha256 = "0sv3p1q3gc9jpjvnl9pjr98kzl3i969hmqbznpby1fgdrlbinvik";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xelb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xpm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }:
-      elpaBuild {
-        pname = "xpm";
-        ename = "xpm";
-        version = "1.0.5.0.20230911.4618";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xpm-1.0.5.0.20230911.4618.tar";
-          sha256 = "0ymby7wqz6bmn4kcl0if0ybhafba139pgmzifvk00bh7r0s5gsz9";
-        };
-        packageRequires = [ cl-lib queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xpm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xr";
-        ename = "xr";
-        version = "1.25.0.20240401.74532";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xr-1.25.0.20240401.74532.tar";
-          sha256 = "0q9s706dz52mfnjhc9b5km7756zsx9ws4nlc607i1v71hhz2k3lg";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xr.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xref";
-        ename = "xref";
-        version = "1.7.0.0.20240707.154630";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar";
-          sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xref.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xref-union = callPackage ({ elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "xref-union";
-        ename = "xref-union";
-        version = "0.2.0.0.20231225.162837";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar";
-          sha256 = "0is4r12r30drq1msa5143bgnwam1kgbf2iia30fbqv0l0rhvqd9x";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xref-union.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    yasnippet = callPackage ({ cl-lib ? null
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "yasnippet";
-        ename = "yasnippet";
-        version = "0.14.1.0.20240406.91451";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar";
-          sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/yasnippet.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    yasnippet-classic-snippets = callPackage ({ elpaBuild
-                                              , fetchurl
-                                              , lib
-                                              , yasnippet }:
-      elpaBuild {
-        pname = "yasnippet-classic-snippets";
-        ename = "yasnippet-classic-snippets";
-        version = "1.0.2.0.20221221.83103";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/yasnippet-classic-snippets-1.0.2.0.20221221.83103.tar";
-          sha256 = "01066fmg42031naaqpy1ls8xw8k2hq02sib43smx20wdbqak6gx7";
-        };
-        packageRequires = [ yasnippet ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    zones = callPackage ({ elpaBuild
-                         , fetchurl
-                         , lib }:
-      elpaBuild {
-        pname = "zones";
-        ename = "zones";
-        version = "2023.6.11.0.20231018.110342";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/zones-2023.6.11.0.20231018.110342.tar";
-          sha256 = "0gyla7n7znzhxfdwb9jmxkijvidpxvqs9p68dbaiyk86daq2pxzm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/zones.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ztree";
-        ename = "ztree";
-        version = "1.0.6.0.20230617.194317";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20230617.194317.tar";
-          sha256 = "1zh6qdzalvikb48dc0pk3rnk7jvknx07dkrggc259q61jdp3pj1m";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ztree.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "zuul";
-        ename = "zuul";
-        version = "0.4.0.0.20230524.131806";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar";
-          sha256 = "1pvfi8dp5i6h7z35h91408pz8bsval35sd7dk02v0hr6znln0pvb";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/zuul.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-  }
+{
+  ace-window = callPackage (
+    {
+      avy,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ace-window";
+      ename = "ace-window";
+      version = "0.10.0.0.20220911.35841";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ace-window-0.10.0.0.20220911.35841.tar";
+        sha256 = "0xfc1pw7m4vg0xvj40djm7rxqr0405pby3rgl5vyd8ci5kpmmvhs";
+      };
+      packageRequires = [ avy ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ace-window.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ack = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ack";
+      ename = "ack";
+      version = "1.11.0.20220924.84123";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar";
+        sha256 = "0vic2izviakj6qh2l15jd8qm8yr0h0qhy4r8sx7zdngpi9i14r5v";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ack.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  activities = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      persist,
+    }:
+    elpaBuild {
+      pname = "activities";
+      ename = "activities";
+      version = "0.8pre0.20240709.193836";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240709.193836.tar";
+        sha256 = "1spvk9z1gc522nq36mhyvn86cq9j64chd3mkizj21j93wkd5i3gy";
+      };
+      packageRequires = [
+        emacs
+        persist
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/activities.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ada-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      gnat-compiler,
+      lib,
+      uniquify-files,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "ada-mode";
+      ename = "ada-mode";
+      version = "8.1.0.0.20231018.91522";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar";
+        sha256 = "07kd6dj1dbds68qmi4dh4w3fc8l18jyxrfbz4lxb5v9c59hk8c46";
+      };
+      packageRequires = [
+        emacs
+        gnat-compiler
+        uniquify-files
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ada-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ada-ref-man = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ada-ref-man";
+      ename = "ada-ref-man";
+      version = "2020.1.0.20201129.190419";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ada-ref-man-2020.1.0.20201129.190419.tar";
+        sha256 = "0a201fn9xs3vg52vri8aw2p56rsw428hk745m6hja6q5gn6rl0zw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  adaptive-wrap = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "adaptive-wrap";
+      ename = "adaptive-wrap";
+      version = "0.8.0.20240113.95028";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar";
+        sha256 = "0dj20mmipnik62480cm11rnvsvbc3js2ql5r321kj20g87rz9l2a";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  adjust-parens = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "adjust-parens";
+      ename = "adjust-parens";
+      version = "3.2.0.20240113.95404";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar";
+        sha256 = "0l7s63dfpar2ddiydl43m6ipzc7qghv9k5hfcnj56aj6hs7ibcd2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  advice-patch = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "advice-patch";
+      ename = "advice-patch";
+      version = "0.1.0.20201220.233221";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar";
+        sha256 = "1bca9s6cxpsyvyl0fxqa59x68rpdj44kxcaxmaa0lsy10vgib542";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/advice-patch.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aggressive-completion = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aggressive-completion";
+      ename = "aggressive-completion";
+      version = "1.7.0.20220417.71805";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar";
+        sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aggressive-indent = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aggressive-indent";
+      ename = "aggressive-indent";
+      version = "1.10.0.0.20230112.100030";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar";
+        sha256 = "0vp49nz5n82pcds2hxqz0fy5zcmvcrpfd1zgsm1cwyph7vvx7djj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  agitate = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "agitate";
+      ename = "agitate";
+      version = "0.0.20240117.23316";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar";
+        sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/agitate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ahungry-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ahungry-theme";
+      ename = "ahungry-theme";
+      version = "1.10.0.0.20211231.115425";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar";
+        sha256 = "0iddqqkv9i3d9yajhysl54av91i0gdngxqyn7vvapf1nz3pxzrvz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aircon-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aircon-theme";
+      ename = "aircon-theme";
+      version = "0.0.6.0.20240613.140459";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar";
+        sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  all = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "all";
+      ename = "all";
+      version = "1.1.0.20240405.133638";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/all-1.1.0.20240405.133638.tar";
+        sha256 = "0cybsyr7ksgslwdfnrz8cpymk34f9gz75ahz368rhg926qlxy95j";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/all.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  altcaps = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "altcaps";
+      ename = "altcaps";
+      version = "1.2.0.0.20240117.23410";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar";
+        sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/altcaps.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ampc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ampc";
+      ename = "ampc";
+      version = "0.2.0.20240220.181558";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240220.181558.tar";
+        sha256 = "139gqhijy92qnprk25av550zd7165ilsnnmdx4v0v0fnwgxnya7h";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ampc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  arbitools = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "arbitools";
+      ename = "arbitools";
+      version = "0.977.0.20221212.221354";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/arbitools-0.977.0.20221212.221354.tar";
+        sha256 = "0s9w9hfki33bnfgm7yyhhcl0kbpn1ahd5li7nfy409zcb5spz17h";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/arbitools.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ascii-art-to-unicode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ascii-art-to-unicode";
+      ename = "ascii-art-to-unicode";
+      version = "1.13.0.20230911.4520";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ascii-art-to-unicode-1.13.0.20230911.4520.tar";
+        sha256 = "10x2svbc9qkrcckwjfsd1rlcqbvapvrb80x8m0p2awffwisr165j";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  assess = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      m-buffer,
+    }:
+    elpaBuild {
+      pname = "assess";
+      ename = "assess";
+      version = "0.7.0.20240303.95456";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar";
+        sha256 = "0yqiqlgnhqvqc4w9s05csk2h2iwyv1m32wb121v6famfqaicgl12";
+      };
+      packageRequires = [
+        emacs
+        m-buffer
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/assess.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  async = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "async";
+      ename = "async";
+      version = "1.9.8.0.20240712.45742";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240712.45742.tar";
+        sha256 = "0a4zbpb58mdcmfq7vfwbsqhcfghxx8c3fkvwsrlg5a3gdcjv4ymv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/async.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auctex = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auctex";
+      ename = "auctex";
+      version = "14.0.6.0.20240630.205810";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240630.205810.tar";
+        sha256 = "0d1pkrqghyz2fqf7qs1yxnibjq0c7a0633j4kq7aqahcb9izpzj1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auctex.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auctex-cont-latexmk = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auctex-cont-latexmk";
+      ename = "auctex-cont-latexmk";
+      version = "0.2.0.20240625.221402";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.2.0.20240625.221402.tar";
+        sha256 = "1yxc34q68cnri7k9m2gdnhhwyqz0gs1ip2r956fbxv65s0s7nbab";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auctex-label-numbers = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auctex-label-numbers";
+      ename = "auctex-label-numbers";
+      version = "0.2.0.20240617.174703";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20240617.174703.tar";
+        sha256 = "14zj8wgk1vs96z5sba4m3m0zhl02zr3mbapgpypf9ff4c28v8g1b";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aumix-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aumix-mode";
+      ename = "aumix-mode";
+      version = "7.0.20221221.74552";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/aumix-mode-7.0.20221221.74552.tar";
+        sha256 = "0c3yhk8ir4adv3wy80iywbvl1sm86xssg0j0q4rym50pr4vqx60n";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-correct = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-correct";
+      ename = "auto-correct";
+      version = "1.1.4.0.20221221.74656";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/auto-correct-1.1.4.0.20221221.74656.tar";
+        sha256 = "10h6b5px4krcwjwhc475al9kcizijsz773zkcijrfi83283l35nc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-correct.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-header = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-header";
+      ename = "auto-header";
+      version = "0.1.2.0.20230407.82136";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/auto-header-0.1.2.0.20230407.82136.tar";
+        sha256 = "1dm5nqcvbya9fyj45q6k8ni507prs3ij2q5rhdl9m8vwkq6gf72w";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-header.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-overlays = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-overlays";
+      ename = "auto-overlays";
+      version = "0.10.10.0.20201215.220815";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/auto-overlays-0.10.10.0.20201215.220815.tar";
+        sha256 = "1gmsli1bil210867x642x4zvhqradl3d4pk4n5ky5g6xp1h36c7w";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  autocrypt = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "autocrypt";
+      ename = "autocrypt";
+      version = "0.4.2.0.20240410.70023";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar";
+        sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/autocrypt.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  avy = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "avy";
+      ename = "avy";
+      version = "0.5.0.0.20230424.65712";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar";
+        sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/avy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bbdb = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bbdb";
+      ename = "bbdb";
+      version = "3.2.2.4.0.20231023.5901";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar";
+        sha256 = "16m5irp1y9crv13l2qncafys4fscwq2d28ig8hnx4g5bag9bi7j4";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bbdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  beacon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "beacon";
+      ename = "beacon";
+      version = "1.3.4.0.20220729.220057";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar";
+        sha256 = "1dpd3j2aip3zi3ivbszsgrifw43bryx01df868hmrxm1s0vvjhh6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/beacon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  beframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "beframe";
+      ename = "beframe";
+      version = "1.1.1.0.20240522.34215";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240522.34215.tar";
+        sha256 = "1ws11ynbcgi37sbh6p3nilq9ca26694qzqvd1h4dk0lb815b66l4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/beframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bicep-ts-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bicep-ts-mode";
+      ename = "bicep-ts-mode";
+      version = "0.1.3.0.20240530.63226";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240530.63226.tar";
+        sha256 = "0xmljjfx7a5b3jfqf7cbpb9102ci5vnkqqww1b328rr42v5sdmqm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bind-key = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bind-key";
+      ename = "bind-key";
+      version = "2.4.1.0.20240321.194020";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar";
+        sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bind-key.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  blist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ilist,
+      lib,
+    }:
+    elpaBuild {
+      pname = "blist";
+      ename = "blist";
+      version = "0.3.0.20231213.61103";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/blist-0.3.0.20231213.61103.tar";
+        sha256 = "01pqf794syngh6v4bym3qzg2rh2gp3z9h6hvpw74nadimfg5pz61";
+      };
+      packageRequires = [
+        emacs
+        ilist
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/blist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bluetooth = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bluetooth";
+      ename = "bluetooth";
+      version = "0.3.1.0.20230119.122638";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar";
+        sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bluetooth.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bnf-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bnf-mode";
+      ename = "bnf-mode";
+      version = "0.4.5.0.20221205.150230";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar";
+        sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  boxy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "boxy";
+      ename = "boxy";
+      version = "1.1.4.0.20240505.204058";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar";
+        sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/boxy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  boxy-headings = callPackage (
+    {
+      boxy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "boxy-headings";
+      ename = "boxy-headings";
+      version = "2.1.6.0.20240505.204122";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar";
+        sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph";
+      };
+      packageRequires = [
+        boxy
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/boxy-headings.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  breadcrumb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "breadcrumb";
+      ename = "breadcrumb";
+      version = "1.0.1.0.20231126.221621";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar";
+        sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/breadcrumb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  brief = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "brief";
+      ename = "brief";
+      version = "5.91.0.20240401.34715";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/brief-5.91.0.20240401.34715.tar";
+        sha256 = "1knpamvbpz92b9zql6p0l7g1p5595l6kns0gw1vfhm7cl37dngyr";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/brief.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buffer-env = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buffer-env";
+      ename = "buffer-env";
+      version = "0.6.0.20240323.72724";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar";
+        sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buffer-env.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buffer-expose = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buffer-expose";
+      ename = "buffer-expose";
+      version = "0.4.3.0.20190429.135558";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar";
+        sha256 = "0f3a064i4a1ylb1ibqmz302h24kymir3zj1d225b7v6r89nam216";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bufferlo = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bufferlo";
+      ename = "bufferlo";
+      version = "0.8.0.20240621.221659";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar";
+        sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bufferlo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bug-hunter = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "bug-hunter";
+      ename = "bug-hunter";
+      version = "1.3.1.0.20201128.92354";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/bug-hunter-1.3.1.0.20201128.92354.tar";
+        sha256 = "1bskf9csg49n4cisl57wv0sa74s6v3wffdxw80m3r2yr0kx01cfs";
+      };
+      packageRequires = [
+        cl-lib
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buildbot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buildbot";
+      ename = "buildbot";
+      version = "0.0.1.0.20230726.134747";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar";
+        sha256 = "1z27pfx3h1fad9wiazrkqgfdc1h06g2rlb3cq1zk83hilg64nnjd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buildbot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  calibre = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "calibre";
+      ename = "calibre";
+      version = "1.4.1.0.20240208.85735";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/calibre-1.4.1.0.20240208.85735.tar";
+        sha256 = "1rbmck8bc28c2rf321606w748nqc5klly6yrm3r8zyviggwd1v2c";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/calibre.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cape = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cape";
+      ename = "cape";
+      version = "1.5.0.20240710.192144";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cape-1.5.0.20240710.192144.tar";
+        sha256 = "0kg9qv8qkcs2v3x1dkyg3j1zxqql000bhbdh7awfk42dfq181lcj";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  capf-autosuggest = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "capf-autosuggest";
+      ename = "capf-autosuggest";
+      version = "0.3.0.20211123.104430";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar";
+        sha256 = "0f16csl2ky8kys3wcv41zqh1l9976gc009pjy21kp6ck0pm0m3kg";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  caps-lock = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "caps-lock";
+      ename = "caps-lock";
+      version = "1.0.0.20221221.74713";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/caps-lock-1.0.0.20221221.74713.tar";
+        sha256 = "0f8n79yw9zs1cpa8nhqmvw95kj762lv8rzrkj30ybvj1612vl1z9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/caps-lock.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  captain = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "captain";
+      ename = "captain";
+      version = "1.0.3.0.20221221.74732";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/captain-1.0.3.0.20221221.74732.tar";
+        sha256 = "0ay26xzbhrxgvslrwcc504k5s0kxk0c8rnps656xz1wl38fbvm5b";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/captain.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  chess = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "chess";
+      ename = "chess";
+      version = "2.0.5.0.20220926.150547";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/chess-2.0.5.0.20220926.150547.tar";
+        sha256 = "16md052m600mmy43fgpcpwl4jz5q67v9w2h3y234ild6sp1qanlj";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/chess.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cl-generic = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cl-generic";
+      ename = "cl-generic";
+      version = "0.3.0.20221221.74800";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cl-generic-0.3.0.20221221.74800.tar";
+        sha256 = "1yhjgcc3rnhi0kf2mgm7yii1pa9hzz0dnfkg393p456rl07q7vqq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cl-generic.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cl-lib = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cl-lib";
+      ename = "cl-lib";
+      version = "0.7.1.0.20221221.74809";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cl-lib-0.7.1.0.20221221.74809.tar";
+        sha256 = "1xig9cma7p5bplnqnxmwh1axxlf813ar69bzyvks09yhg04jikm1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cl-lib.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  clipboard-collector = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "clipboard-collector";
+      ename = "clipboard-collector";
+      version = "0.3.0.20190215.154741";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar";
+        sha256 = "03y1wivagbsl4f2qgmxcy43pbpvpxhd1d57ihpdvsl2illb6bwlq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cobol-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cobol-mode";
+      ename = "cobol-mode";
+      version = "1.1.0.20240505.191317";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20240505.191317.tar";
+        sha256 = "1nv0594a244yp5rv9y7bna37sr4cn0869g7i48888dphg6savlb7";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  code-cells = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "code-cells";
+      ename = "code-cells";
+      version = "0.4.0.20231119.213845";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20231119.213845.tar";
+        sha256 = "1i66d234fb9g4aqnpzjz9dn6hs37bq5l1vrk076hib1rb1vm36ir";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/code-cells.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  colorful-mode = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "colorful-mode";
+      ename = "colorful-mode";
+      version = "1.0.4.0.20240712.155246";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240712.155246.tar";
+        sha256 = "1n2b5av3k8kwx6f5x0ziq7virv7n2d9npw11s934qzq3qfk2m8i3";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  comint-mime = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "comint-mime";
+      ename = "comint-mime";
+      version = "0.4.0.20240426.193136";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240426.193136.tar";
+        sha256 = "1znk6anr6yxb9jfh3z7702msl011k54z37vbixbdk2bvd7hihcx3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/comint-mime.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  compact-docstrings = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "compact-docstrings";
+      ename = "compact-docstrings";
+      version = "0.2.0.20220305.183958";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/compact-docstrings-0.2.0.20220305.183958.tar";
+        sha256 = "024l45bxxkh6x7rd8qcmykxdhdj0yckcf7vzacl7ynzwm9ah7sry";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/compact-docstrings.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "company";
+      ename = "company";
+      version = "0.10.2.0.20240713.30311";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240713.30311.tar";
+        sha256 = "166sgcwvwysvnlwm91bz2c4k85y846qflpg80ywyhnjklskldjh9";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company-ebdb = callPackage (
+    {
+      company,
+      ebdb,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "company-ebdb";
+      ename = "company-ebdb";
+      version = "1.1.0.20221221.74915";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/company-ebdb-1.1.0.20221221.74915.tar";
+        sha256 = "1qidrgcm2hdkrbh75rjfzxbmbyvxvyfy4m2kd6lgcx0v494lzvqw";
+      };
+      packageRequires = [
+        company
+        ebdb
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company-math = callPackage (
+    {
+      company,
+      elpaBuild,
+      fetchurl,
+      lib,
+      math-symbol-lists,
+    }:
+    elpaBuild {
+      pname = "company-math";
+      ename = "company-math";
+      version = "1.5.1.0.20221227.132907";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/company-math-1.5.1.0.20221227.132907.tar";
+        sha256 = "070kfw13aw1hfvkdxb83zic44301nawnl57saqwrg6lh0psxpyxv";
+      };
+      packageRequires = [
+        company
+        math-symbol-lists
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company-math.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company-statistics = callPackage (
+    {
+      company,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "company-statistics";
+      ename = "company-statistics";
+      version = "0.2.3.0.20170210.193350";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar";
+        sha256 = "0fwvaadfr5jlx3021kfjbij9692c2v3l600v2rwqijc563phdfg3";
+      };
+      packageRequires = [
+        company
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company-statistics.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  compat = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "compat";
+      ename = "compat";
+      version = "30.0.0.0.0.20240708.182228";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240708.182228.tar";
+        sha256 = "0qgr35606hqz5x6161lwq8zv15z08pm1xbfv32qgzpszmyj8855d";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/compat.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult";
+      ename = "consult";
+      version = "1.7.0.20240710.202854";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/consult-1.7.0.20240710.202854.tar";
+        sha256 = "0l4w88530qh65m5wkh8i5z2sv3zfm1jylr3885s550ix0dq45503";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-denote = callPackage (
+    {
+      consult,
+      denote,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-denote";
+      ename = "consult-denote";
+      version = "0.1.1.0.20240703.93551";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/consult-denote-0.1.1.0.20240703.93551.tar";
+        sha256 = "1275qhz4fyrh1qr1mjhzy923x4rs90v80sdiazmszn72dcvp25bq";
+      };
+      packageRequires = [
+        consult
+        denote
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-denote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-hoogle = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      haskell-mode,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-hoogle";
+      ename = "consult-hoogle";
+      version = "0.2.1.0.20240427.131842";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar";
+        sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m";
+      };
+      packageRequires = [
+        emacs
+        haskell-mode
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-recoll = callPackage (
+    {
+      consult,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-recoll";
+      ename = "consult-recoll";
+      version = "0.8.1.0.20231211.122134";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar";
+        sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1";
+      };
+      packageRequires = [
+        consult
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  context-coloring = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "context-coloring";
+      ename = "context-coloring";
+      version = "8.1.0.0.20240331.133753";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20240331.133753.tar";
+        sha256 = "1m8c7vccdb868n777rqi8mhjwfbm25q7hbx7x6y145mxmnqr1vgn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/context-coloring.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  corfu = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "corfu";
+      ename = "corfu";
+      version = "1.4.0.20240711.184800";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/corfu-1.4.0.20240711.184800.tar";
+        sha256 = "0fvpsblz8750vlnv4mbwh0zz90xn35svbii2hyz2ngzb0yjrygch";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/corfu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  coterm = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "coterm";
+      ename = "coterm";
+      version = "1.6.0.20221015.160420";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar";
+        sha256 = "1633q3vrqhjfv4ipirirgkpmal5j1rfh6jxkq3sm3qwlg8lgak4s";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/coterm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  counsel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+      swiper,
+    }:
+    elpaBuild {
+      pname = "counsel";
+      ename = "counsel";
+      version = "0.14.2.0.20240520.132838";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240520.132838.tar";
+        sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr";
+      };
+      packageRequires = [
+        emacs
+        ivy
+        swiper
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/counsel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cpio-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cpio-mode";
+      ename = "cpio-mode";
+      version = "0.17.0.20211211.193556";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar";
+        sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cpupower = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cpupower";
+      ename = "cpupower";
+      version = "1.0.5.0.20230704.131557";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20230704.131557.tar";
+        sha256 = "1xls5wjxrx2a193piav0yp0sv1m7jv5zqk46hbxxhfakl3jg5zlq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cpupower.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  crdt = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "crdt";
+      ename = "crdt";
+      version = "0.3.5.0.20230213.22302";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar";
+        sha256 = "0cl97di7s5a1v6widil63pwzywxpcxmhvhp34kqn256czsliv4pw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/crdt.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  crisp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "crisp";
+      ename = "crisp";
+      version = "1.3.6.0.20221221.74923";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/crisp-1.3.6.0.20221221.74923.tar";
+        sha256 = "0kpw81h9n8qwrvmqan9bwj32d4vgsrmma4f0rig04bdx0mxmdzir";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/crisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  csharp-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "csharp-mode";
+      ename = "csharp-mode";
+      version = "2.0.0.0.20221205.181941";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar";
+        sha256 = "1cmc6b7pwjalzipc2clis2si7d03r0glpgxj7qpvfdp26y1cjabv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  csv-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "csv-mode";
+      ename = "csv-mode";
+      version = "1.25.0.20240529.65338";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/csv-mode-1.25.0.20240529.65338.tar";
+        sha256 = "0rr4gz38y1gyzg8mwyl62macjq31rs6fvx3pngamyq1y3ghpivsb";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/csv-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cursory = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cursory";
+      ename = "cursory";
+      version = "1.0.1.0.20240425.35714";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar";
+        sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cursory.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cycle-quotes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cycle-quotes";
+      ename = "cycle-quotes";
+      version = "0.1.0.20221221.75021";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/cycle-quotes-0.1.0.20221221.75021.tar";
+        sha256 = "0igwwbhf1b6c67znik3zphdngddkgai146qcjlkgg1ihr4ajc3pc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cycle-quotes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dape = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      jsonrpc,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dape";
+      ename = "dape";
+      version = "0.13.0.0.20240711.211516";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dape-0.13.0.0.20240711.211516.tar";
+        sha256 = "13wzg3z8pfd0gydld2np2bih7bpmpvm98m6z5cwmc2bfh20p8xpa";
+      };
+      packageRequires = [
+        emacs
+        jsonrpc
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  darkroom = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "darkroom";
+      ename = "darkroom";
+      version = "0.3.0.20200507.173652";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/darkroom-0.3.0.20200507.173652.tar";
+        sha256 = "1j57wa2jhpjs6ynda73s0vv4dzyr9jg0lifv7nc8bv79lr4sjab2";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/darkroom.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dash = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dash";
+      ename = "dash";
+      version = "2.19.1.0.20240510.132708";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar";
+        sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dash.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dbus-codegen = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dbus-codegen";
+      ename = "dbus-codegen";
+      version = "0.1.0.20220306.62546";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dbus-codegen-0.1.0.20220306.62546.tar";
+        sha256 = "1jg8ibxy79g93b3hl97bpgz90ny5q936k8bjcmxix7hn82wg7a9l";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  debbugs = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      soap-client,
+    }:
+    elpaBuild {
+      pname = "debbugs";
+      ename = "debbugs";
+      version = "0.40.0.20240318.175047";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar";
+        sha256 = "02kb6klsixyxn4a65mgr9m8n1cx68n7zqyym8m14381k0mi8pq0h";
+      };
+      packageRequires = [
+        emacs
+        soap-client
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/debbugs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  delight = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "delight";
+      ename = "delight";
+      version = "1.7.0.20200711.42851";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/delight-1.7.0.20200711.42851.tar";
+        sha256 = "1v8yhii0s1rs1c2i7gs2rd98224qhpkybvrks8w5ghq4p3nxrrvw";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/delight.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote";
+      ename = "denote";
+      version = "3.0.6.0.20240712.154245";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-3.0.6.0.20240712.154245.tar";
+        sha256 = "134s5mgkrsi65skvhqic89ch9806ln6s9glhh8dz552yb46pwbdd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-menu = callPackage (
+    {
+      denote,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-menu";
+      ename = "denote-menu";
+      version = "1.2.0.0.20240712.110155";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20240712.110155.tar";
+        sha256 = "182dbr5hay13nca52qyymmrsmfcwd62ncayjh76ii0jn3khbcqzf";
+      };
+      packageRequires = [
+        denote
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  detached = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "detached";
+      ename = "detached";
+      version = "0.10.1.0.20221129.143049";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar";
+        sha256 = "0fidhqf1m599v939hv3xsqbkckgk2fm550i7lkh0p961a3v542i8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/detached.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devdocs = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devdocs";
+      ename = "devdocs";
+      version = "0.6.1.0.20240428.71147";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar";
+        sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/devdocs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devicetree-ts-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devicetree-ts-mode";
+      ename = "devicetree-ts-mode";
+      version = "0.3.0.20240117.132538";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar";
+        sha256 = "12jfiv7j0k5sqjbz28nd5x34hpxp76lyl41fl7bvsgiyb06i0gnf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dict-tree = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      heap,
+      lib,
+      tNFA,
+      trie,
+    }:
+    elpaBuild {
+      pname = "dict-tree";
+      ename = "dict-tree";
+      version = "0.17.0.20231015.24654";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dict-tree-0.17.0.20231015.24654.tar";
+        sha256 = "0nij9pkscr6mdjmrq9dlqnks91sd21pn01bsgn4zk918zygnkggj";
+      };
+      packageRequires = [
+        emacs
+        heap
+        tNFA
+        trie
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dict-tree.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diff-hl = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diff-hl";
+      ename = "diff-hl";
+      version = "1.9.2.0.20240702.202011";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240702.202011.tar";
+        sha256 = "12i8vl4jiv3v952h7amlmzkvvdpdfmfj77xz3hyjyrr6zvdhygls";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diff-hl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diffview = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diffview";
+      ename = "diffview";
+      version = "1.0.0.20230224.111651";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/diffview-1.0.0.20230224.111651.tar";
+        sha256 = "1shw58jk2dzr8sc9hhfjqjrmwqarvq989ic96zjmhajxvcqcz3ql";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diffview.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diminish = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diminish";
+      ename = "diminish";
+      version = "0.46.0.20220909.84745";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar";
+        sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diminish.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-du = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-du";
+      ename = "dired-du";
+      version = "0.5.2.0.20221221.75108";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar";
+        sha256 = "0h31k45sx47vmk20sn77fzz86gbwiqxrryr091p5s05smrlsfxc2";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-du.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-duplicates = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-duplicates";
+      ename = "dired-duplicates";
+      version = "0.4.0.20240328.201645";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dired-duplicates-0.4.0.20240328.201645.tar";
+        sha256 = "0122wxl2sql31s4h7rf7mxz6kv15m77q9bqmixxsgzhfghbia7k7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-git-info = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-git-info";
+      ename = "dired-git-info";
+      version = "0.3.1.0.20191229.192948";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar";
+        sha256 = "0zq74nynra4cbyb81l3v9w0qrzz057z9abg6c6zjshlrq8kxv5kx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-preview = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-preview";
+      ename = "dired-preview";
+      version = "0.2.0.0.20240507.55800";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240507.55800.tar";
+        sha256 = "1m7zgmjhw86yrhj5chci73rbgky3ybzni5j6xvwpxqxl6g41ph04";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-preview.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  disk-usage = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "disk-usage";
+      ename = "disk-usage";
+      version = "1.3.3.0.20230920.164444";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar";
+        sha256 = "06vd56yaaz9a6b46g4r6ccasc74pyqls9krj3bcrdayhj34w3mxy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/disk-usage.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dismal = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dismal";
+      ename = "dismal";
+      version = "1.5.2.0.20221221.75154";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar";
+        sha256 = "0nyy9dkafkzxvx60d1bzrn2a1m3n53al3x17r3kf7d2b24gcljbd";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dismal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  djvu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "djvu";
+      ename = "djvu";
+      version = "1.1.2.0.20221221.75224";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/djvu-1.1.2.0.20221221.75224.tar";
+        sha256 = "0iirmzaah0nix14jaj0hnszrdkdsh4wli8hb951l7iw7szkc5fsp";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/djvu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  do-at-point = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "do-at-point";
+      ename = "do-at-point";
+      version = "0.1.2.0.20240625.155102";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20240625.155102.tar";
+        sha256 = "035f0gqywlrr8cwwk9b04nczcv8slf76f2ixvam949fphhc0zkrb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/do-at-point.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  doc-toc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "doc-toc";
+      ename = "doc-toc";
+      version = "1.2.0.20230409.212954";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar";
+        sha256 = "1gcdkcb1ydgl24jmrnkg1a7kndl7kkvckwf12y5pj2l2idf9ifx8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/doc-toc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  docbook = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "docbook";
+      ename = "docbook";
+      version = "0.1.0.20221221.75233";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/docbook-0.1.0.20221221.75233.tar";
+        sha256 = "0r7sjnbj4wgqa2vw57ac28gixw762km0cwas0qhclxizb95nsnz2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/docbook.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  drepl = callPackage (
+    {
+      comint-mime,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "drepl";
+      ename = "drepl";
+      version = "0.3.0.20240603.71909";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240603.71909.tar";
+        sha256 = "0fjs0k36xm2sy3p0yi2km7pcrjv3f0gsc6qbrh47qimn7x5b9bkh";
+      };
+      packageRequires = [
+        comint-mime
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/drepl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dts-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dts-mode";
+      ename = "dts-mode";
+      version = "1.0.0.20221221.75311";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar";
+        sha256 = "1bpd6npx70rzh3mb5235g1ydh839bnjag70qp17r0wd2wkj6w0gj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  easy-escape = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "easy-escape";
+      ename = "easy-escape";
+      version = "0.2.1.0.20210917.85414";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/easy-escape-0.2.1.0.20210917.85414.tar";
+        sha256 = "0hk9244g7hgnan7xd4451qjklfqh5hbkxjl60l32nr19ynw0ygif";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/easy-escape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  easy-kill = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "easy-kill";
+      ename = "easy-kill";
+      version = "0.9.5.0.20220511.55730";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar";
+        sha256 = "0il8lhi2j80sz63lnjkayryikcya03zn3z40bnfjbsydpyqj4kzd";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/easy-kill.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ebdb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "ebdb";
+      ename = "ebdb";
+      version = "0.8.22.0.20240305.123820";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar";
+        sha256 = "0j6wflmslapq3wr5bg6ql7qamh9k9zzp1xzadkxq3i3124syanfs";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ebdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ebdb-gnorb = callPackage (
+    {
+      ebdb,
+      elpaBuild,
+      fetchurl,
+      gnorb,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ebdb-gnorb";
+      ename = "ebdb-gnorb";
+      version = "1.0.2.0.20221221.75324";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ebdb-gnorb-1.0.2.0.20221221.75324.tar";
+        sha256 = "0lzsarv0pkdgkj19il0syk7yz6gcfkp0rl3i49rsqb3lpf5b6s5q";
+      };
+      packageRequires = [
+        ebdb
+        gnorb
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ebdb-i18n-chn = callPackage (
+    {
+      ebdb,
+      elpaBuild,
+      fetchurl,
+      lib,
+      pyim,
+    }:
+    elpaBuild {
+      pname = "ebdb-i18n-chn";
+      ename = "ebdb-i18n-chn";
+      version = "1.3.2.0.20221221.75334";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ebdb-i18n-chn-1.3.2.0.20221221.75334.tar";
+        sha256 = "16hna0z08903pkq957cgxk26ihq6j3fab775ickb24zfssjm3l61";
+      };
+      packageRequires = [
+        ebdb
+        pyim
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ediprolog = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ediprolog";
+      ename = "ediprolog";
+      version = "2.2.0.20221026.91800";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar";
+        sha256 = "0y2xa0k7sv21yabxkfzxnl0fdnppgcwx5jdnm1zw2j2sbaf9k6ca";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ediprolog.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eev = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "eev";
+      ename = "eev";
+      version = "20240710.0.20240710.214351";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/eev-20240710.0.20240710.214351.tar";
+        sha256 = "120yka4xv6zqcd7gi6c4qlgydyqv86s15p444jsjiz57zvc5p991";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eev.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ef-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ef-themes";
+      ename = "ef-themes";
+      version = "1.7.0.0.20240605.183445";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240605.183445.tar";
+        sha256 = "09zmi2rsykdjkmj7hdylsqhqfd87i1g2g4v6sizm94s0hmvxa148";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ef-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eglot = callPackage (
+    {
+      compat,
+      eldoc,
+      elpaBuild,
+      emacs,
+      external-completion,
+      fetchurl,
+      flymake ? null,
+      jsonrpc,
+      lib,
+      project,
+      seq,
+      track-changes,
+      xref,
+    }:
+    elpaBuild {
+      pname = "eglot";
+      ename = "eglot";
+      version = "1.17.0.20240707.154630";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240707.154630.tar";
+        sha256 = "0f7lbbsh5y4945j8115ph5i2k9c3r0ipcxhmig9kvba6knrshgin";
+      };
+      packageRequires = [
+        compat
+        eldoc
+        emacs
+        external-completion
+        flymake
+        jsonrpc
+        project
+        seq
+        track-changes
+        xref
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eglot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  el-search = callPackage (
+    {
+      cl-print ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      stream,
+    }:
+    elpaBuild {
+      pname = "el-search";
+      ename = "el-search";
+      version = "1.12.6.1.0.20221221.75346";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/el-search-1.12.6.1.0.20221221.75346.tar";
+        sha256 = "12500xc7aln09kzf3kn6xq7xnphbqzmyz20h0sgpf8f1rvlh2h33";
+      };
+      packageRequires = [
+        cl-print
+        emacs
+        stream
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/el-search.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eldoc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "eldoc";
+      ename = "eldoc";
+      version = "1.15.0.0.20240708.123037";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar";
+        sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eldoc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  electric-spacing = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "electric-spacing";
+      ename = "electric-spacing";
+      version = "5.0.0.20201201.154407";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/electric-spacing-5.0.0.20201201.154407.tar";
+        sha256 = "0ywa68zwci0v6g9nc8czlhvf9872vl262nrxffahc5r7lp1hay8k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elisp-benchmarks = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "elisp-benchmarks";
+      ename = "elisp-benchmarks";
+      version = "1.16.0.20240708.114026";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240708.114026.tar";
+        sha256 = "1njklwjfmwmxzhd535bkq32ljx99rb0q0jspg02vy88w89wbnkb8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ellama = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      llm,
+      spinner,
+    }:
+    elpaBuild {
+      pname = "ellama";
+      ename = "ellama";
+      version = "0.11.9.0.20240710.202758";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ellama-0.11.9.0.20240710.202758.tar";
+        sha256 = "01qfp01lgs84xzzkkky4539bvmakf3xbgr1h57asfsy3j50nsblf";
+      };
+      packageRequires = [
+        compat
+        emacs
+        llm
+        spinner
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ellama.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emacs-gc-stats = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "emacs-gc-stats";
+      ename = "emacs-gc-stats";
+      version = "1.4.2.0.20231206.152254";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar";
+        sha256 = "08ivfm6m9y4i1w0xmjkbs6b2h7i5q1v2991rjs2w5s9d864yqg2l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  embark = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "embark";
+      ename = "embark";
+      version = "1.1.0.20240607.161338";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/embark-1.1.0.20240607.161338.tar";
+        sha256 = "14ar8sfjrk1q6f2dis2w8qa8nsqla8cz91l4nsssr1mfgs7x517b";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/embark.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  embark-consult = callPackage (
+    {
+      compat,
+      consult,
+      elpaBuild,
+      emacs,
+      embark,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "embark-consult";
+      ename = "embark-consult";
+      version = "1.1.0.20240607.161338";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240607.161338.tar";
+        sha256 = "1m48pddbyxpi7ji9cl0pd4npkl6xj7fdak4raacglbgayg4z9qdb";
+      };
+      packageRequires = [
+        compat
+        consult
+        emacs
+        embark
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/embark-consult.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ement = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      map,
+      persist,
+      plz,
+      svg-lib,
+      taxy,
+      taxy-magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "ement";
+      ename = "ement";
+      version = "0.16pre0.20240707.203749";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ement-0.16pre0.20240707.203749.tar";
+        sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2";
+      };
+      packageRequires = [
+        emacs
+        map
+        persist
+        plz
+        svg-lib
+        taxy
+        taxy-magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ement.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emms = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+      seq,
+    }:
+    elpaBuild {
+      pname = "emms";
+      ename = "emms";
+      version = "20.1.0.20240704.95932";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/emms-20.1.0.20240704.95932.tar";
+        sha256 = "1mid0m39af2mcq99xbdjxiiliw6axaysm6cfriyl00w0w6ybfrjf";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/emms.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  engrave-faces = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "engrave-faces";
+      ename = "engrave-faces";
+      version = "0.3.1.0.20240421.82802";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20240421.82802.tar";
+        sha256 = "0dxj9m9jyvrqhv67m2kkh0akjc7l6h40fvsy20k721zq9xvc6zkl";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  enwc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "enwc";
+      ename = "enwc";
+      version = "2.0.0.20171007.121321";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar";
+        sha256 = "0c308kd1pinhb1lh2vi40bcnmvzydf1j7sqka9kajhxr0l4kjazb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/enwc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  epoch-view = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "epoch-view";
+      ename = "epoch-view";
+      version = "0.0.1.0.20221221.75416";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/epoch-view-0.0.1.0.20221221.75416.tar";
+        sha256 = "0hd51d441c2w05rx10wpa0rbc94pjwwaqy5mxlgfwnx52jabz15h";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/epoch-view.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  erc = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "erc";
+      ename = "erc";
+      version = "5.6.1snapshot0.20240709.13309";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240709.13309.tar";
+        sha256 = "1ijn2rwl2lpqckps4xxqxsn6385y84xmid83a2cj4fkkgjks7jnv";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/erc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ergoemacs-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "ergoemacs-mode";
+      ename = "ergoemacs-mode";
+      version = "5.16.10.12.0.20240129.80712";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240129.80712.tar";
+        sha256 = "0jsl7yyhbcg1y20lp50r3i3rcxmxq035mks1kwbsnyqmdikby9s3";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ess = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ess";
+      ename = "ess";
+      version = "24.1.1.0.20240516.81354";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240516.81354.tar";
+        sha256 = "0r4kk65sd8kzdm11c7dz1m4qicjv6zg36r7gdg2mzpl0ym33g8aj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ess.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  excorporate = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      fsm,
+      lib,
+      nadvice,
+      soap-client,
+      url-http-ntlm,
+      url-http-oauth,
+    }:
+    elpaBuild {
+      pname = "excorporate";
+      ename = "excorporate";
+      version = "1.1.2.0.20240219.90343";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/excorporate-1.1.2.0.20240219.90343.tar";
+        sha256 = "0wm1qx1y9az3fdh81hjccpsw4xxx0p9acz9pfvsyjlywclcycd4i";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        fsm
+        nadvice
+        soap-client
+        url-http-ntlm
+        url-http-oauth
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/excorporate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  expand-region = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "expand-region";
+      ename = "expand-region";
+      version = "1.0.0.0.20240119.103925";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar";
+        sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/expand-region.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  expreg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "expreg";
+      ename = "expreg";
+      version = "1.3.1.0.20230915.150818";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar";
+        sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/expreg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  external-completion = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "external-completion";
+      ename = "external-completion";
+      version = "0.1.0.20240616.203826";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240616.203826.tar";
+        sha256 = "1zg7v08wbk8ma5k2zj0jrchf2wz483bklgi0rshjividniy99877";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/external-completion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  exwm = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xelb,
+    }:
+    elpaBuild {
+      pname = "exwm";
+      ename = "exwm";
+      version = "0.31.0.20240708.212458";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240708.212458.tar";
+        sha256 = "0cb9y753d7gj40wfwg4my339kiffdydch1bmhdqw1haf3a21srar";
+      };
+      packageRequires = [
+        compat
+        emacs
+        xelb
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/exwm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  f90-interface-browser = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "f90-interface-browser";
+      ename = "f90-interface-browser";
+      version = "1.1.0.20221221.75553";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/f90-interface-browser-1.1.0.20221221.75553.tar";
+        sha256 = "0qv3v3ya8qdgwq0plcc3qbba4n66fqww3sawmqhzssksry39l1yj";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  face-shift = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "face-shift";
+      ename = "face-shift";
+      version = "0.2.1.0.20230426.73945";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar";
+        sha256 = "0gl9k7g3wsc045dx9mp9ypk084r4j3mhf2a4xn08lzz8z8i9k2rz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/face-shift.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  filechooser = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "filechooser";
+      ename = "filechooser";
+      version = "0.2.1.0.20240707.120050";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar";
+        sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/filechooser.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  filladapt = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "filladapt";
+      ename = "filladapt";
+      version = "2.12.2.0.20221221.75607";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar";
+        sha256 = "11s9n8d4psjs4dbsx2w8hyir5hapz952da5nz3xihli8a0q93mhv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/filladapt.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  firefox-javascript-repl = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "firefox-javascript-repl";
+      ename = "firefox-javascript-repl";
+      version = "0.9.5.0.20230605.161924";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar";
+        sha256 = "1nfkzx07j3hddai213lia9pixfrrdajrvg7fvlx5js8zxfpvcjx6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flylisp = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flylisp";
+      ename = "flylisp";
+      version = "0.2.0.20221221.75619";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar";
+        sha256 = "110hfk979c664y27qf5af54phm8i4iq5qqk5vygjwd7252nd7i4a";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flylisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake = callPackage (
+    {
+      eldoc,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "flymake";
+      ename = "flymake";
+      version = "1.3.7.0.20240707.154630";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240707.154630.tar";
+        sha256 = "1y1r7hz8692y1q9n75vgq26liilaaiz1h8l3jh3n6dqyzll6c2wi";
+      };
+      packageRequires = [
+        eldoc
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-codespell = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-codespell";
+      ename = "flymake-codespell";
+      version = "0.1.0.20231030.222337";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar";
+        sha256 = "1v3a2gg4myav4cs1vj4d5isxhbw9qvryk5r2dx3x19qqmmmm6djz";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-proselint = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-proselint";
+      ename = "flymake-proselint";
+      version = "0.3.0.0.20230325.160756";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar";
+        sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  fontaine = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "fontaine";
+      ename = "fontaine";
+      version = "2.0.0.0.20240426.105847";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240426.105847.tar";
+        sha256 = "0h7l5agnzpq8k14c3lr6dkpsh2id9akiqa9z3x88xn440rjbld51";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/fontaine.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  frame-tabs = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "frame-tabs";
+      ename = "frame-tabs";
+      version = "1.1.0.20221221.75627";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/frame-tabs-1.1.0.20221221.75627.tar";
+        sha256 = "08ql56h8h425ngs40m9zpy4ysxlxi74vanlkga42bskzax0ns2cm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  frog-menu = callPackage (
+    {
+      avy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      posframe,
+    }:
+    elpaBuild {
+      pname = "frog-menu";
+      ename = "frog-menu";
+      version = "0.2.11.0.20201115.95734";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/frog-menu-0.2.11.0.20201115.95734.tar";
+        sha256 = "00ihlqq4bxgrp6hdf1b6xhnvp87ilys1ykp0l38cs5lv6a10wvqs";
+      };
+      packageRequires = [
+        avy
+        emacs
+        posframe
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/frog-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  fsm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "fsm";
+      ename = "fsm";
+      version = "0.2.1.0.20221212.223608";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar";
+        sha256 = "1zwl1b9sn4imxynada0vf8nxwm49lh8fahxfc35czlbn0w0jqm1k";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/fsm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ftable = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ftable";
+      ename = "ftable";
+      version = "1.1.0.20230102.145125";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar";
+        sha256 = "0231qjah5s76g8dmnc5zpn6i6lysypf6jvvzmnyyv92lr8arzmfz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ftable.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gcmh = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gcmh";
+      ename = "gcmh";
+      version = "0.2.1.0.20201116.225142";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar";
+        sha256 = "0yb47avdy5f3a2g9cg2028h5agsqpddsbfsc6ncavnxnnyiccj8h";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gcmh.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ggtags = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ggtags";
+      ename = "ggtags";
+      version = "0.9.0.0.20230602.13355";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar";
+        sha256 = "1krykf1hknczhdhh8rfj4vzcba87q5sjbv0p2y41mcvmmfnhharw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ggtags.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gited = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gited";
+      ename = "gited";
+      version = "0.6.0.0.20221221.75709";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar";
+        sha256 = "095679pq1lam42zran5qjk3zd4gf908vd5fkq9jppqlilcsqf7zb";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gited.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gle-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gle-mode";
+      ename = "gle-mode";
+      version = "1.1.0.20221221.75729";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gle-mode-1.1.0.20221221.75729.tar";
+        sha256 = "1bakvlx4bzz62hibwwm0hmhyzqqzy31xvsg6pw3lh2i028qd1ykx";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gle-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnat-compiler = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "gnat-compiler";
+      ename = "gnat-compiler";
+      version = "1.0.3.0.20230915.165808";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar";
+        sha256 = "0rm0s33nl9dzghlfsprycr2na412z4vnfc69q2pc6nlazsliz6w0";
+      };
+      packageRequires = [
+        emacs
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnome-c-style = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnome-c-style";
+      ename = "gnome-c-style";
+      version = "0.1.0.20230924.235858";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20230924.235858.tar";
+        sha256 = "0gij2d1k40yhifr7ad3p465f5lg77cb441pl41mdc0g6v5gipnqf";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnorb = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnorb";
+      ename = "gnorb";
+      version = "1.6.11.0.20230108.110132";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnorb-1.6.11.0.20230108.110132.tar";
+        sha256 = "0jha80xr8pbribp0ki40cydvi35as7v2c2xsy0anh65j9ciym5ag";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnorb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-elpa = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-elpa";
+      ename = "gnu-elpa";
+      version = "1.1.0.20221212.224322";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar";
+        sha256 = "0hk9ha7f0721wnsnjazpr970lfa4q03dhpxxffw9qcn1mlvh8qb8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnu-elpa.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-elpa-keyring-update = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-elpa-keyring-update";
+      ename = "gnu-elpa-keyring-update";
+      version = "2022.12.1.0.20240525.173808";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.1.0.20240525.173808.tar";
+        sha256 = "0s8fydk7b3qc6zv90n3bjniczr5911jkza5xqwi69cb1v9fbfjyd";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnugo = callPackage (
+    {
+      ascii-art-to-unicode,
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      xpm,
+    }:
+    elpaBuild {
+      pname = "gnugo";
+      ename = "gnugo";
+      version = "3.1.2.0.20230911.4426";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar";
+        sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj";
+      };
+      packageRequires = [
+        ascii-art-to-unicode
+        cl-lib
+        xpm
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnugo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnus-mock = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnus-mock";
+      ename = "gnus-mock";
+      version = "0.5.0.20210503.105756";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gnus-mock-0.5.0.20210503.105756.tar";
+        sha256 = "1gpjbx9iabrx2b4qinw0chv44g2v1z2ivaiywjzr3vy3h3pp6fga";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gpastel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gpastel";
+      ename = "gpastel";
+      version = "0.5.0.0.20231030.71342";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar";
+        sha256 = "1d5pj1rk0xv2fww827yplpcll5hy8w9fkcm9c8wf4yi3l6igkmgz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gpastel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gpr-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      gnat-compiler,
+      lib,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "gpr-mode";
+      ename = "gpr-mode";
+      version = "1.0.5.0.20231115.90848";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar";
+        sha256 = "1m768s196027zl402vmfvdzvdl3whbjg5lyfiwjx25d9gfx32351";
+      };
+      packageRequires = [
+        emacs
+        gnat-compiler
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gpr-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gpr-query = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      gnat-compiler,
+      lib,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "gpr-query";
+      ename = "gpr-query";
+      version = "1.0.4.0.20231018.92052";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar";
+        sha256 = "0j0p685v1v0byma8x5lpihvfj6hyg30dx8jqa6q0xmm2c6i8cqai";
+      };
+      packageRequires = [
+        emacs
+        gnat-compiler
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gpr-query.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  graphql = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "graphql";
+      ename = "graphql";
+      version = "0.1.2.0.20221202.2453";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar";
+        sha256 = "0wh1lnn85nj026iln02b7p5hgrwd3dmqjkv48gc33ypyd4afh31z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/graphql.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  greader = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "greader";
+      ename = "greader";
+      version = "0.11.13.0.20240712.232251";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/greader-0.11.13.0.20240712.232251.tar";
+        sha256 = "08gajcssq4h84r61sh1hpg86dklrh86slvd3q5b65nlwps5mslh6";
+      };
+      packageRequires = [
+        compat
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/greader.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  greenbar = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "greenbar";
+      ename = "greenbar";
+      version = "1.1.0.20221221.80217";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/greenbar-1.1.0.20221221.80217.tar";
+        sha256 = "00kch8c0sz5z3cx0likx0pyqp9jxvjd6lkmdcli4zzpc6j1f1a0k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/greenbar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gtags-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gtags-mode";
+      ename = "gtags-mode";
+      version = "1.8.0.20240712.131914";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/gtags-mode-1.8.0.20240712.131914.tar";
+        sha256 = "1rzmgzirxxrhm8f3vbwf76nrrzd1svf4ddy20h0khp7ycldhd3hp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  guess-language = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "guess-language";
+      ename = "guess-language";
+      version = "0.0.1.0.20240528.185800";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20240528.185800.tar";
+        sha256 = "0hlcnd69mqs90ndp59pqcjdwl27cswnpqy6yjzaspmbya6plv3g6";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/guess-language.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hcel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hcel";
+      ename = "hcel";
+      version = "1.0.0.0.20221012.11633";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar";
+        sha256 = "03k08w10bvl6fz7nkmv2d7kksphxigw6cwfhfq0kkgxn4l8h37an";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hcel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  heap = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "heap";
+      ename = "heap";
+      version = "0.5.0.20201214.121301";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/heap-0.5.0.20201214.121301.tar";
+        sha256 = "0917bfrdiwwmdqmnpy2cg1dn7v5gyl7damwp6ld7sky6v3d113ya";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/heap.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hiddenquote = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hiddenquote";
+      ename = "hiddenquote";
+      version = "1.2.0.20231107.184113";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar";
+        sha256 = "0iy7mxqhph4kmp4a96r141f4dpk5vwiydx9i9gx5c13zzwvy2y7r";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  highlight-escape-sequences = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "highlight-escape-sequences";
+      ename = "highlight-escape-sequences";
+      version = "0.4.0.20201214.173014";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/highlight-escape-sequences-0.4.0.20201214.173014.tar";
+        sha256 = "13x8750r3zn9sqbsxliiipk6kfnpg7clmd49niyrh80x9nj4pf72";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hook-helpers = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hook-helpers";
+      ename = "hook-helpers";
+      version = "1.1.1.0.20201201.93957";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar";
+        sha256 = "0x3358k5lglnb4yf27c2ybzlsw9jp4n4jh5sizczl9n8g1vxbgkb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  html5-schema = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "html5-schema";
+      ename = "html5-schema";
+      version = "0.1.0.20221221.80245";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/html5-schema-0.1.0.20221221.80245.tar";
+        sha256 = "15f1nhsgpp0mv8mdrvv0jnscq0j23ggriw2d2dw26sr6lv93w2r4";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/html5-schema.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hydra = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      lv,
+    }:
+    elpaBuild {
+      pname = "hydra";
+      ename = "hydra";
+      version = "0.15.0.0.20221030.224757";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar";
+        sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn";
+      };
+      packageRequires = [
+        emacs
+        lv
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hydra.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hyperbole = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hyperbole";
+      ename = "hyperbole";
+      version = "9.0.2pre0.20240707.235928";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240707.235928.tar";
+        sha256 = "1rrj0zmc5wfrdzzwpihpxrw6xawswnkszb1753p5sg3sxmj5h2kw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hyperbole.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  idlwave = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "idlwave";
+      ename = "idlwave";
+      version = "6.5.1.0.20240523.142720";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/idlwave-6.5.1.0.20240523.142720.tar";
+        sha256 = "00i7kl0j7aacm7vyjgmm2kqhjjb3s70g69ka3sqhigm7s1hn3zk9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/idlwave.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ilist = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ilist";
+      ename = "ilist";
+      version = "0.3.0.20240219.40214";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ilist-0.3.0.20240219.40214.tar";
+        sha256 = "0nxwvnpnyccx384f8ik0z8a74fksvwrmpdzk4wia1x6wdwwvblvs";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ilist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inspector = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inspector";
+      ename = "inspector";
+      version = "0.36.0.20230925.194622";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/inspector-0.36.0.20230925.194622.tar";
+        sha256 = "1g989zgbhila0f4yca70iwgnqr0zcainji9mps0ywrmlmn270gdv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/inspector.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ioccur = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ioccur";
+      ename = "ioccur";
+      version = "2.6.0.20211231.163129";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar";
+        sha256 = "0v048d1p95km3jwgs6x805fjg6qfv5pjwdwia1wzl9liqai21v1c";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ioccur.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  isearch-mb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "isearch-mb";
+      ename = "isearch-mb";
+      version = "0.8.0.20240310.84654";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar";
+        sha256 = "1rb97ir8nbv7ici8isjcm4bfaxakd6a05yxv9as2wv9xl8fzfhwq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  iterators = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "iterators";
+      ename = "iterators";
+      version = "0.1.1.0.20221221.80300";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar";
+        sha256 = "10cx933rk7f92jk8q87b69ls3w823fwxnr7i6j0bxpzjx66q15yk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/iterators.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy";
+      ename = "ivy";
+      version = "0.14.2.0.20240524.114155";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar";
+        sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-avy = callPackage (
+    {
+      avy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy-avy";
+      ename = "ivy-avy";
+      version = "0.14.2.0.20240214.214218";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20240214.214218.tar";
+        sha256 = "1i3hrc5pb30qkzzpiza0mff97132b04sglg39mg0ad05hl3sq5dc";
+      };
+      packageRequires = [
+        avy
+        emacs
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-explorer = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy-explorer";
+      ename = "ivy-explorer";
+      version = "0.3.2.0.20190909.192125";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar";
+        sha256 = "1jvahaswknvaia62cq8bz5lx55fb1c07zr63n7awcp0sajk3ph3z";
+      };
+      packageRequires = [
+        emacs
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-hydra = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      hydra,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy-hydra";
+      ename = "ivy-hydra";
+      version = "0.14.2.0.20240214.214337";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20240214.214337.tar";
+        sha256 = "1paqprwizhavr1kfijfbr0my3ncmw94821d3c9qj1fnjkp3nfj4x";
+      };
+      packageRequires = [
+        emacs
+        hydra
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-posframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+      posframe,
+    }:
+    elpaBuild {
+      pname = "ivy-posframe";
+      ename = "ivy-posframe";
+      version = "0.6.3.0.20211217.23411";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar";
+        sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69";
+      };
+      packageRequires = [
+        emacs
+        ivy
+        posframe
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jami-bot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jami-bot";
+      ename = "jami-bot";
+      version = "0.0.4.0.20240204.184721";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240204.184721.tar";
+        sha256 = "04zdnrah3jypkyx8dl0ns7cjcws5yv4d56ixaa94vjjjvyw9d8mv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jami-bot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jarchive = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jarchive";
+      ename = "jarchive";
+      version = "0.11.0.0.20231010.221311";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar";
+        sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jarchive.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  javaimp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "javaimp";
+      ename = "javaimp";
+      version = "0.9.1.0.20221221.80314";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar";
+        sha256 = "0dj7mzdfj1gvd18mdnf19pv5zljhhada6a5s3bm5drpw12vx5334";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/javaimp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jgraph-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jgraph-mode";
+      ename = "jgraph-mode";
+      version = "1.1.0.20221221.80333";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jgraph-mode-1.1.0.20221221.80333.tar";
+        sha256 = "1ddmyxanfnqfmwx3ld25awm4qhwbzavla8xan261nyh4wwnm8hfq";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jinx = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jinx";
+      ename = "jinx";
+      version = "1.9.0.20240708.212221";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jinx-1.9.0.20240708.212221.tar";
+        sha256 = "10lp9pnlxaxr1rblkg3996m6bvhdkqhc4my8gxbswxsv9djaw621";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jinx.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jit-spell = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jit-spell";
+      ename = "jit-spell";
+      version = "0.4.0.20240604.141707";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240604.141707.tar";
+        sha256 = "0qz81zrqhdymir9kbmkyavb591abv2j5iz1in2y0v96hpilxfdw6";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jit-spell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  js2-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "js2-mode";
+      ename = "js2-mode";
+      version = "20231224.0.20240418.608";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar";
+        sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/js2-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  json-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "json-mode";
+      ename = "json-mode";
+      version = "0.2.0.20221221.80401";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar";
+        sha256 = "0hr0dqnz3c9bc78k3nnwrhwqhgyjq1qpnjfa7wd9bsla3gfp88hk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/json-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jsonrpc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jsonrpc";
+      ename = "jsonrpc";
+      version = "1.0.25.0.20240616.203826";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240616.203826.tar";
+        sha256 = "0jkhhds21vw4i03ya8lflkkh0yaqxqhj49zdzb1l7wgsb499hhya";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jumpc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jumpc";
+      ename = "jumpc";
+      version = "3.1.0.20231015.14814";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/jumpc-3.1.0.20231015.14814.tar";
+        sha256 = "1v8jxyvs0540w6rdsy96a49lb8nhrq4r66mmvc42j8lh7k4nggdw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jumpc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kind-icon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      svg-lib,
+    }:
+    elpaBuild {
+      pname = "kind-icon";
+      ename = "kind-icon";
+      version = "0.2.2.0.20240321.120430";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar";
+        sha256 = "1cwp2cc2qy36s4zz6arfr760a9x77h0cj42q6a0s32l56sddh7ws";
+      };
+      packageRequires = [
+        emacs
+        svg-lib
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kind-icon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kiwix = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      request,
+    }:
+    elpaBuild {
+      pname = "kiwix";
+      ename = "kiwix";
+      version = "1.1.5.0.20220316.84759";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar";
+        sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna";
+      };
+      packageRequires = [
+        emacs
+        request
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kiwix.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kmb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "kmb";
+      ename = "kmb";
+      version = "0.1.0.20221221.80420";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar";
+        sha256 = "00zqrfh1nqn01azmkd2gy3il48h1sddp6addj9yfq4kwd7ylhym5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kmb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  landmark = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "landmark";
+      ename = "landmark";
+      version = "1.0.0.20221221.80428";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/landmark-1.0.0.20221221.80428.tar";
+        sha256 = "1rwiysmynp2z4bfynhf9k1zd3y5s6dyp2312vq1rhyifgdd8mivq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/landmark.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  latex-table-wizard = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "latex-table-wizard";
+      ename = "latex-table-wizard";
+      version = "1.5.4.0.20230903.170436";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.4.0.20230903.170436.tar";
+        sha256 = "1y1crsd29fvqabzwzki7jqziarycix6bib0cmxlrfsqs95y7dr5w";
+      };
+      packageRequires = [
+        auctex
+        emacs
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  leaf = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "leaf";
+      ename = "leaf";
+      version = "4.5.5.0.20230803.74443";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar";
+        sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/leaf.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lentic = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      m-buffer,
+    }:
+    elpaBuild {
+      pname = "lentic";
+      ename = "lentic";
+      version = "0.12.0.20240303.95600";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/lentic-0.12.0.20240303.95600.tar";
+        sha256 = "0w6fl0yzmh0gd3d5d5049zrx341x0jrj48g265jy4jywdvk621kv";
+      };
+      packageRequires = [
+        dash
+        emacs
+        m-buffer
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lentic.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lentic-server = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lentic,
+      lib,
+      web-server,
+    }:
+    elpaBuild {
+      pname = "lentic-server";
+      ename = "lentic-server";
+      version = "0.2.0.20240314.214448";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/lentic-server-0.2.0.20240314.214448.tar";
+        sha256 = "1mg12bkwsqm4nwwwmpfx3dav583i96dsk5ap5hjiz2ggwwrmrq8h";
+      };
+      packageRequires = [
+        lentic
+        web-server
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lentic-server.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  let-alist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "let-alist";
+      ename = "let-alist";
+      version = "1.0.6.0.20240102.14710";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar";
+        sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/let-alist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lex = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lex";
+      ename = "lex";
+      version = "1.2.0.20240216.82808";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/lex-1.2.0.20240216.82808.tar";
+        sha256 = "0mh2jk838216mwv6bab28mq9nb5617c5y7s0yqynkz3vkarnnxx1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lex.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lin = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lin";
+      ename = "lin";
+      version = "1.0.0.0.20240117.24849";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20240117.24849.tar";
+        sha256 = "1yjqq1zzv0a7ydhjjh7ycgwd8fzlkvza3m8dm9wa45lqljf5ysim";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lin.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  listen = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      persist,
+      taxy,
+      taxy-magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "listen";
+      ename = "listen";
+      version = "0.10pre0.20240419.165028";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240419.165028.tar";
+        sha256 = "1bmjnigb4ly14i3n7wgd0jx4k0g06cf2n3dapfdwlv80bi57x20a";
+      };
+      packageRequires = [
+        emacs
+        persist
+        taxy
+        taxy-magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/listen.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  literate-scratch = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "literate-scratch";
+      ename = "literate-scratch";
+      version = "1.0.0.20240621.41043";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/literate-scratch-1.0.0.20240621.41043.tar";
+        sha256 = "0k1vgb1pmrdhq0mlvrpgdsamqfbhvrjwm2jgixla82j7814zzckq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  llm = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "llm";
+      ename = "llm";
+      version = "0.16.1.0.20240706.201250";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/llm-0.16.1.0.20240706.201250.tar";
+        sha256 = "0kx90fqdsp762774f07jb4m9vr4lnimls45g4a16rq7xy783cd57";
+      };
+      packageRequires = [
+        emacs
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/llm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lmc = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lmc";
+      ename = "lmc";
+      version = "1.4.0.20230105.113402";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar";
+        sha256 = "0ldwr9gw0bkcj43w5x84qwq2gvv2nr53711wlh42zawh0dyhm8h7";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lmc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  load-dir = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "load-dir";
+      ename = "load-dir";
+      version = "0.0.5.0.20221221.80456";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/load-dir-0.0.5.0.20221221.80456.tar";
+        sha256 = "00ynwml6xf7341z1w0wz1afh9jc4v8ggc8izy8qcvdiawxc418iq";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/load-dir.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  load-relative = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "load-relative";
+      ename = "load-relative";
+      version = "1.3.2.0.20230214.53224";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/load-relative-1.3.2.0.20230214.53224.tar";
+        sha256 = "19pkb7xqyllll2pgyqs7bv0qfbv6n9i5qlx9rjzm4ws0c9j464zd";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/load-relative.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  loc-changes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "loc-changes";
+      ename = "loc-changes";
+      version = "1.2.0.20201201.94106";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/loc-changes-1.2.0.20201201.94106.tar";
+        sha256 = "1jrjqn5600l245vhr5h6zwg6g72k0n721ck94mji755bqd231yxs";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/loc-changes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  loccur = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "loccur";
+      ename = "loccur";
+      version = "1.2.5.0.20240610.183057";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/loccur-1.2.5.0.20240610.183057.tar";
+        sha256 = "1apir3ijix4pkrv8q30xxqbiwvj78vp3y68ffq18fcwiww0gkavf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/loccur.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  logos = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "logos";
+      ename = "logos";
+      version = "1.1.1.0.20240224.55443";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar";
+        sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/logos.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  luwak = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "luwak";
+      ename = "luwak";
+      version = "1.0.0.0.20221125.50733";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar";
+        sha256 = "0b4kxq5im8gvg1zg12b8ii62w0vsf3gacimwd603srfc5l1rbvcw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/luwak.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lv = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lv";
+      ename = "lv";
+      version = "0.15.0.0.20221030.224757";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar";
+        sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lv.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  m-buffer = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "m-buffer";
+      ename = "m-buffer";
+      version = "0.16.0.20240302.175529";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar";
+        sha256 = "18lj0gb56xhwrbihijy4p5lyxqvdfcwyabcd30qy1dn4k715v614";
+      };
+      packageRequires = [ seq ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/m-buffer.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  map = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "map";
+      ename = "map";
+      version = "3.3.1.0.20240221.84915";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar";
+        sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/map.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  marginalia = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "marginalia";
+      ename = "marginalia";
+      version = "1.6.0.20240710.95347";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240710.95347.tar";
+        sha256 = "1943srwzm6w4ixcb48d968pbf4hs3y3rwcmcnryh8az2q3j6sqgm";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/marginalia.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  markchars = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "markchars";
+      ename = "markchars";
+      version = "0.2.2.0.20221221.80510";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/markchars-0.2.2.0.20221221.80510.tar";
+        sha256 = "0f1n1jzhksl5cl5c4n2arqhj2zkwzs8i4yzdz39y2b51x2gi2yav";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/markchars.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  math-symbol-lists = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "math-symbol-lists";
+      ename = "math-symbol-lists";
+      version = "1.3.0.20220828.204754";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/math-symbol-lists-1.3.0.20220828.204754.tar";
+        sha256 = "0q038qwcq7lg3a7n451gw80xlwv4hczz3432xcx00hxgvlh744yc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mct = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mct";
+      ename = "mct";
+      version = "1.0.0.0.20240429.72524";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar";
+        sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mct.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  memory-usage = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "memory-usage";
+      ename = "memory-usage";
+      version = "0.2.0.20201201.223908";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/memory-usage-0.2.0.20201201.223908.tar";
+        sha256 = "1jybms0756sswwdq8gqc6kpp5m7y971v4yzcmhraykhf32rwf4rq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/memory-usage.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  metar = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "metar";
+      ename = "metar";
+      version = "0.3.0.20221221.80722";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/metar-0.3.0.20221221.80722.tar";
+        sha256 = "08xcxx9wbjkqf6s1rbsp54f648r8n122k66nfd8ibv9qbd8qvmxq";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/metar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  midi-kbd = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "midi-kbd";
+      ename = "midi-kbd";
+      version = "0.2.0.20221221.80736";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar";
+        sha256 = "0fz9r0y3qdnaq9wi00151xzqh3ygwcfw6yl32cs1vaaxv2czkjai";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mines = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mines";
+      ename = "mines";
+      version = "1.6.0.20201130.184335";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar";
+        sha256 = "0vl93im89fg72wpcqdhg1x2l4iybznh6gjvpkr1i29y05fsx2aad";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mines.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minibuffer-header = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minibuffer-header";
+      ename = "minibuffer-header";
+      version = "0.5.0.20220921.71345";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar";
+        sha256 = "1s77h5s2abpm75k57zcp1s525qs74sdm6vpzlkvqjz8lpn8zkkp0";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minibuffer-line = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minibuffer-line";
+      ename = "minibuffer-line";
+      version = "0.1.0.20221221.80745";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/minibuffer-line-0.1.0.20221221.80745.tar";
+        sha256 = "10gl1lnihawv9dw2rzaydyh8cdgpqgj7y8jsr6hjgqv82hxqyccn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minimap = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minimap";
+      ename = "minimap";
+      version = "1.4.0.20201201.162630";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/minimap-1.4.0.20201201.162630.tar";
+        sha256 = "0h0ydmfinr82j0ifkgwjhc8blg6z2f5k0711fwrcbx8wrgrvfh5v";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minimap.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mmm-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mmm-mode";
+      ename = "mmm-mode";
+      version = "0.5.11.0.20240222.42825";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/mmm-mode-0.5.11.0.20240222.42825.tar";
+        sha256 = "037g19hdya14q7wivdcw8h7wyx8lb8pw5waya3ak435cyfmpg1a7";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  modus-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "modus-themes";
+      ename = "modus-themes";
+      version = "4.4.0.0.20240709.63840";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240709.63840.tar";
+        sha256 = "19yys9lkfsrcbib4rd0ph8d1a3698bih0ghihpb7i1mxy2x0dxwj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/modus-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mpdired = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mpdired";
+      ename = "mpdired";
+      version = "2.0.20240614.95804";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar";
+        sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mpdired.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  multi-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "multi-mode";
+      ename = "multi-mode";
+      version = "1.14.0.20221221.80812";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar";
+        sha256 = "1r41alsvaab8h5cngy0hjs78shv60qp1g68jppl5qlhd6a7h95ih";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/multi-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  multishell = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "multishell";
+      ename = "multishell";
+      version = "1.1.10.0.20220605.120254";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/multishell-1.1.10.0.20220605.120254.tar";
+        sha256 = "0pl45mwwgdf505sviyzacalq6kisq0pnh99i1cnclrmjkjy6yxz9";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/multishell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  muse = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "muse";
+      ename = "muse";
+      version = "3.20.2.0.20240209.184001";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/muse-3.20.2.0.20240209.184001.tar";
+        sha256 = "1sn5siingpzg4y5wjc3ff2ln98gb7hhvwmhnvhmmqbnb8r459vs0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/muse.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  myers = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "myers";
+      ename = "myers";
+      version = "0.1.0.20221221.80834";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar";
+        sha256 = "11nwn1nysr09r1701cd3wvkzn01s19l6lla0f33vqm66ahj9yldh";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/myers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nadvice = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nadvice";
+      ename = "nadvice";
+      version = "0.4.0.20230111.104526";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar";
+        sha256 = "0855x3vgp0i6kmi5kf8365xqnj92k9lwqyfn40i59fp4jj3c00kr";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nadvice.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nameless = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nameless";
+      ename = "nameless";
+      version = "1.0.2.0.20230112.95905";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar";
+        sha256 = "1b44w8jkqqsi995a2daw05ks64njlgpkab6m3iy3lx3v8fggjahp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nameless.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  names = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "names";
+      ename = "names";
+      version = "20151201.0.0.20220425.173515";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/names-20151201.0.0.20220425.173515.tar";
+        sha256 = "1s91v83jkwxjl1iqrmjy60rnnqcgzly0z8chp87f7i22fj5gjz4h";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/names.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nano-agenda = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nano-agenda";
+      ename = "nano-agenda";
+      version = "0.3.0.20230417.100538";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar";
+        sha256 = "1fhpic6zimk81a7w6m9hl6iw0vniz3pl775sxyg167ysn5sqsl2y";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nano-modeline = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nano-modeline";
+      ename = "nano-modeline";
+      version = "1.1.0.0.20240429.102433";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar";
+        sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nano-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nano-theme";
+      ename = "nano-theme";
+      version = "0.3.4.0.20240624.80231";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240624.80231.tar";
+        sha256 = "1h2sifcl26av1lzzmngb2svl23hchjnzd8aaszkxxwh34wg1cgnk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nano-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nftables-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nftables-mode";
+      ename = "nftables-mode";
+      version = "1.1.0.20221221.80909";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar";
+        sha256 = "149qz88wlapln0b8d9mcmj630vyh2ha65hqb46yrf08fch992cpx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nhexl-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nhexl-mode";
+      ename = "nhexl-mode";
+      version = "1.5.0.20221215.152407";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar";
+        sha256 = "0bdw6lycm1hclz3qzckcpnssrd4i52051dzbs87f9sv6f6v31373";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nlinum = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nlinum";
+      ename = "nlinum";
+      version = "1.9.0.20221221.80940";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/nlinum-1.9.0.20221221.80940.tar";
+        sha256 = "15kw7r8lz9nb5s0rzgdlj1s1kl1l6nxzr7kmwv5i7b1xhpnyn7xn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nlinum.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  notes-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "notes-mode";
+      ename = "notes-mode";
+      version = "1.31.0.20240402.80928";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/notes-mode-1.31.0.20240402.80928.tar";
+        sha256 = "1kiki1b6bx3nn1xgbnh0xnwnhx5wkn0zzlk6jfsks5npj2a4h88g";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/notes-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  notmuch-indicator = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "notmuch-indicator";
+      ename = "notmuch-indicator";
+      version = "1.2.0.0.20240511.94138";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar";
+        sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ntlm = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ntlm";
+      ename = "ntlm";
+      version = "2.1.0.0.20240102.22814";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar";
+        sha256 = "0wr9bhxxdkpfvwla97xrd77dv3321apq1gmcpqadyjvxl44c0km7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ntlm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  num3-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "num3-mode";
+      ename = "num3-mode";
+      version = "1.5.0.20221221.81242";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/num3-mode-1.5.0.20221221.81242.tar";
+        sha256 = "076m1lh9ma1wzavirmy7dq7nsl410n03yf7vq4ljxvbkw801sig7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/num3-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  oauth2 = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "oauth2";
+      ename = "oauth2";
+      version = "0.16.0.20221221.81302";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar";
+        sha256 = "1imdggvj98db8cs0s2qx72ifavi6h3flym70zm2g1w8v2fmcq8dj";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/oauth2.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ob-asymptote = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ob-asymptote";
+      ename = "ob-asymptote";
+      version = "1.0.0.20230908.121002";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar";
+        sha256 = "1lpv4rf7qf1yvpm4j3wiajdk72lgl4gk8qgwflzyq9yvmksakdvp";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ob-asymptote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ob-haxe = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ob-haxe";
+      ename = "ob-haxe";
+      version = "1.0.0.20210211.73431";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ob-haxe-1.0.0.20210211.73431.tar";
+        sha256 = "148bly2nf0r64q2cfm0hd6i26bxaans7aj52nv4gb5qxsiqng0ly";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  objed = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "objed";
+      ename = "objed";
+      version = "0.8.3.0.20201002.84752";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar";
+        sha256 = "1fjcl2gm4675l430rdr2lihsj13n24pi9zwjfqvsm4bnqbx9ywiz";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/objed.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  omn-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "omn-mode";
+      ename = "omn-mode";
+      version = "1.3.0.20240326.173146";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/omn-mode-1.3.0.20240326.173146.tar";
+        sha256 = "1iyh0xqm9aag92vj44l4ymrjc0gnn41gckk1l96605cfkwr5m6qa";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/omn-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  on-screen = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "on-screen";
+      ename = "on-screen";
+      version = "1.3.3.0.20201127.191411";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/on-screen-1.3.3.0.20201127.191411.tar";
+        sha256 = "1dak8rb89mkdpv3xc2h0kpn09i4l42iavslvkhy2vxj0qq6c1r9p";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/on-screen.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  openpgp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "openpgp";
+      ename = "openpgp";
+      version = "1.0.1.0.20230325.141904";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/openpgp-1.0.1.0.20230325.141904.tar";
+        sha256 = "012svyzmr4rwi2a1v99klyjnwrrfqz8jd053f9xjfm44payfafkg";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/openpgp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  orderless = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "orderless";
+      ename = "orderless";
+      version = "1.1.0.20240711.200241";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240711.200241.tar";
+        sha256 = "04ambf76p24z45b5zswbqprbvy31vdg48mk36dmd85apl0myvi95";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/orderless.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org";
+      ename = "org";
+      version = "9.8pre0.20240712.111340";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-9.8pre0.20240712.111340.tar";
+        sha256 = "1nqx0kvmxf7prfip30l1br9gl2s7bmcacds5ifafawywnc720jl6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-contacts = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-contacts";
+      ename = "org-contacts";
+      version = "1.1.0.20240609.105801";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240609.105801.tar";
+        sha256 = "1rx5lnn151wn42zpnrr64g1qn5lvk0syfqm2v4h58np7lsf10c2y";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-contacts.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-edna = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+      seq,
+    }:
+    elpaBuild {
+      pname = "org-edna";
+      ename = "org-edna";
+      version = "1.1.2.0.20200902.94459";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-edna-1.1.2.0.20200902.94459.tar";
+        sha256 = "043pb34ai8rj515zgbw5nq5x3mkiyqcnk25787qc3mbddi9n9hwq";
+      };
+      packageRequires = [
+        emacs
+        org
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-edna.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-jami-bot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      jami-bot,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-jami-bot";
+      ename = "org-jami-bot";
+      version = "0.0.5.0.20240204.184749";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-jami-bot-0.0.5.0.20240204.184749.tar";
+        sha256 = "1zl9xblhppqwddizf7s7l9d4qzcr8d6vgvjwmiw4wvb4lpyba9r4";
+      };
+      packageRequires = [
+        emacs
+        jami-bot
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-modern = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-modern";
+      ename = "org-modern";
+      version = "1.3.0.20240708.215718";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-modern-1.3.0.20240708.215718.tar";
+        sha256 = "1r3hk48781j375c307dp3mgb662nk223g6cqfbv72jhqbis7770g";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-modern.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-notify = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-notify";
+      ename = "org-notify";
+      version = "0.1.1.0.20231016.93952";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar";
+        sha256 = "0pxm5pbmsf965daf3y7v5x6ca8ddi2a9d4lm04ky3113zz5ay95d";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-notify.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-real = callPackage (
+    {
+      boxy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-real";
+      ename = "org-real";
+      version = "1.0.9.0.20240505.204156";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar";
+        sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp";
+      };
+      packageRequires = [
+        boxy
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-real.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-remark = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-remark";
+      ename = "org-remark";
+      version = "1.2.2.0.20240629.103632";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar";
+        sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-remark.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-transclusion = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-transclusion";
+      ename = "org-transclusion";
+      version = "1.4.0.0.20240520.170949";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar";
+        sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-translate = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-translate";
+      ename = "org-translate";
+      version = "0.1.4.0.20220312.90634";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar";
+        sha256 = "1fq0h0q5nh92dc9vgp7nmqyz2nl0byd2v6vl5k2lk3rlmbx7jnkz";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-translate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  orgalist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "orgalist";
+      ename = "orgalist";
+      version = "1.16.0.20240618.91747";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/orgalist-1.16.0.20240618.91747.tar";
+        sha256 = "0kw1iasyg5j1kghwb952rah040qhybhycsmgk8y0rfk382ra3a1i";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/orgalist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  osc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "osc";
+      ename = "osc";
+      version = "0.4.0.20221221.81343";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/osc-0.4.0.20221221.81343.tar";
+        sha256 = "0mlyszhc2nbf5p4jnc6wlq8iipzmy9ymvbszq13myza410nd9xqh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/osc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  osm = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "osm";
+      ename = "osm";
+      version = "1.3.0.20240708.215736";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/osm-1.3.0.20240708.215736.tar";
+        sha256 = "12w8mgm7b3hg4h6yks0a1z2sy22b91gk5qsbs014ymq1z4mg38m3";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/osm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  other-frame-window = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "other-frame-window";
+      ename = "other-frame-window";
+      version = "1.0.6.0.20221221.81352";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar";
+        sha256 = "11fdg3nl1w4vm46477kwk6d6vz769q726iz5cwknbvjzj8an994s";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pabbrev = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pabbrev";
+      ename = "pabbrev";
+      version = "4.3.0.0.20240617.162224";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240617.162224.tar";
+        sha256 = "0wkizis0wb6syy2lzp1mi2cn5znzangi1w18jcn5ra8k8xj66yp4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pabbrev.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  paced = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "paced";
+      ename = "paced";
+      version = "1.1.3.0.20190227.204125";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar";
+        sha256 = "1ykjmv45kkfa569m8hpvya8a7wvkqrg9nbz28sbxmx79abm1bmmi";
+      };
+      packageRequires = [
+        async
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/paced.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parsec = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "parsec";
+      ename = "parsec";
+      version = "0.1.3.0.20180729.171626";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar";
+        sha256 = "0lhcj6cjgkq9ha85n0hqcm0ik7avfzw9f8zcklyivwn2bx80r7r7";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/parsec.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parser-generator = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "parser-generator";
+      ename = "parser-generator";
+      version = "0.2.1.0.20240220.204114";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar";
+        sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/parser-generator.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  path-iterator = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "path-iterator";
+      ename = "path-iterator";
+      version = "1.0.0.20221221.81414";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar";
+        sha256 = "1ln9l9x6bj1sp7shc2iafn11yji6lsgm4fm1ji1kfp3my1zhqc40";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/path-iterator.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  peg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "peg";
+      ename = "peg";
+      version = "1.0.1.0.20221221.81502";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar";
+        sha256 = "0gc41pf2gy01bmjgx09c1kifi6pkhcm8jrbdx1ncblhix76ia4q4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/peg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  perl-doc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "perl-doc";
+      ename = "perl-doc";
+      version = "0.81.0.20230805.210315";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar";
+        sha256 = "0n129rcmn827payv0aqg8iz7dc7wg4rm27hvvw1wwj2k5x5vnd6r";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/perl-doc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  persist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "persist";
+      ename = "persist";
+      version = "0.6.1.0.20240615.190609";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240615.190609.tar";
+        sha256 = "0qncm2q42y4xqijx468cpvbh841nw9fk27mm5zdc3l792i0i29y4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/persist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  phpinspect = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "phpinspect";
+      ename = "phpinspect";
+      version = "0.0.20240322.152749";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar";
+        sha256 = "0060s1p60cqq0llx5m41iwqj1bxl98c444kyhfvdvx3c7z5dapmp";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/phpinspect.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  phps-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "phps-mode";
+      ename = "phps-mode";
+      version = "0.4.49.0.20240424.65247";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/phps-mode-0.4.49.0.20240424.65247.tar";
+        sha256 = "03xz1ig3zsbwixa4hkh7g9ihjxlw2jmzydqldkvjsyv1yhyyf2j4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/phps-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pinentry = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pinentry";
+      ename = "pinentry";
+      version = "0.1.0.20231126.141402";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar";
+        sha256 = "056h9zfbk4mfpvfpli2kr48i5cdcrf73v15id0dk762iy7iz38af";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pinentry.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "plz";
+      ename = "plz";
+      version = "0.9.0.20240610.142147";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/plz-0.9.0.20240610.142147.tar";
+        sha256 = "1jbm07jw7kw2s57q4d0l6r8zxwjj1mi9kx37ppdqv28dbjmbln1r";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz-event-source = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "plz-event-source";
+      ename = "plz-event-source";
+      version = "0.1pre0.20240607.160859";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240607.160859.tar";
+        sha256 = "02wv00dij35crkff82plxlkwgninjnllpc44lq0ynxwk1lgx3q5a";
+      };
+      packageRequires = [
+        emacs
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz-event-source.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz-media-type = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "plz-media-type";
+      ename = "plz-media-type";
+      version = "0.1pre0.20240607.134302";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240607.134302.tar";
+        sha256 = "1q6a4yyy339l2crc24mssxansmpmhq401h3mcqkzkcw60xh9wsr8";
+      };
+      packageRequires = [
+        emacs
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz-media-type.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz-see = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "plz-see";
+      ename = "plz-see";
+      version = "0.1.0.20231101.73512";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar";
+        sha256 = "09ibjvd9wvndrygnfq0jic7m9bk6v490rk1k3b4qjvv5xfvsvvhq";
+      };
+      packageRequires = [
+        emacs
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz-see.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  poke = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "poke";
+      ename = "poke";
+      version = "3.2.0.20230517.100500";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar";
+        sha256 = "0p12szh563vynl7h9j55v7373g43fhmsy03iibvnywaira4arw5l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/poke.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  poke-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "poke-mode";
+      ename = "poke-mode";
+      version = "3.1.0.20231014.222558";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar";
+        sha256 = "1aqw9rn17n7ywnys6dlwykrf63l4kgapqsk1fay5qjj0y1nkq167";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/poke-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  poker = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "poker";
+      ename = "poker";
+      version = "0.2.0.20221221.81510";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/poker-0.2.0.20221221.81510.tar";
+        sha256 = "14xc4jpkpy88drijp19znfhlyv61p2fx2l3zqsqbl3br2xwxy219";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/poker.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  polymode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "polymode";
+      ename = "polymode";
+      version = "0.2.2.0.20230317.121821";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar";
+        sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/polymode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  popper = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "popper";
+      ename = "popper";
+      version = "0.4.6.0.20240701.211603";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar";
+        sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/popper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  posframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "posframe";
+      ename = "posframe";
+      version = "1.4.3.0.20240703.35906";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar";
+        sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/posframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pq = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pq";
+      ename = "pq";
+      version = "0.2.0.20240317.135839";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar";
+        sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pq.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  prefixed-core = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "prefixed-core";
+      ename = "prefixed-core";
+      version = "0.0.20221212.225529";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/prefixed-core-0.0.20221212.225529.tar";
+        sha256 = "1b9bikccig8l96fal97lv6gajjip6qmbkx21y0pndfbw2kaamic4";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/prefixed-core.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  preview-auto = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "preview-auto";
+      ename = "preview-auto";
+      version = "0.3.0.20240629.205058";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240629.205058.tar";
+        sha256 = "12qmpx9lamxkwkvximygqkczyvwxv6dn8zyv8x55v2qiav0vcp1r";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/preview-auto.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  preview-tailor = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "preview-tailor";
+      ename = "preview-tailor";
+      version = "0.2.0.20240617.174356";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20240617.174356.tar";
+        sha256 = "17x74wzfi7kc08x1kwlzvsyiqmimxf77k58amskyg73l1iqmr8s8";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  project = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xref,
+    }:
+    elpaBuild {
+      pname = "project";
+      ename = "project";
+      version = "0.11.1.0.20240614.152748";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240614.152748.tar";
+        sha256 = "0izv7szsi3gqqafdjrqnpy3znsk1izr2zkcyc45jiyv5bafd76ik";
+      };
+      packageRequires = [
+        emacs
+        xref
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/project.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  psgml = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "psgml";
+      ename = "psgml";
+      version = "1.3.5.0.20221229.184738";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/psgml-1.3.5.0.20221229.184738.tar";
+        sha256 = "1zdfdzbadrbj6g4k2q7w5yvxvblpwn4mkihmnmag7jym66r4wmnb";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/psgml.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pspp-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pspp-mode";
+      ename = "pspp-mode";
+      version = "1.1.0.20221221.81719";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pspp-mode-1.1.0.20221221.81719.tar";
+        sha256 = "010qckmc85wc4i7k1rmhffcdbpxpvs6p5qxdvr6g3ws00c1a3j4l";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pulsar = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pulsar";
+      ename = "pulsar";
+      version = "1.0.1.0.20240429.64508";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar";
+        sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pulsar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pyim = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xr,
+    }:
+    elpaBuild {
+      pname = "pyim";
+      ename = "pyim";
+      version = "5.3.4.0.20240508.25615";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pyim-5.3.4.0.20240508.25615.tar";
+        sha256 = "0p079girx795fvqswdjh8l5mwdyndanfcsvb1qvj2klq063y1vv5";
+      };
+      packageRequires = [
+        async
+        emacs
+        xr
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pyim.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pyim-basedict = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pyim-basedict";
+      ename = "pyim-basedict";
+      version = "0.5.4.0.20220614.110824";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar";
+        sha256 = "0md12ysqcmz737vcs8wh561zl8s98w04cgzs69pbdnzzxas7iy2j";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  python = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "python";
+      ename = "python";
+      version = "0.28.0.20240708.74355";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/python-0.28.0.20240708.74355.tar";
+        sha256 = "0q4s3lqifq6nrs9irqz709msja5slw6kc66gigm653m1n9j9kr1i";
+      };
+      packageRequires = [
+        compat
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/python.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  quarter-plane = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "quarter-plane";
+      ename = "quarter-plane";
+      version = "0.1.0.20221221.81727";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/quarter-plane-0.1.0.20221221.81727.tar";
+        sha256 = "1s0fl9sxjhv0sl5ikvkhdnddjg1n2hzw0a64xcvm8859dk77fmy8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  queue = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "queue";
+      ename = "queue";
+      version = "0.2.0.20210306.173709";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/queue-0.2.0.20210306.173709.tar";
+        sha256 = "09iicl5fdpli6jnvdj0h8cwj7wqqmxnfzdd57vfjdq09v3sjkljs";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/queue.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rainbow-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rainbow-mode";
+      ename = "rainbow-mode";
+      version = "1.0.6.0.20231215.171141";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar";
+        sha256 = "0qr0yl8fszrrdnl8x3d8lnndr5s9g3bf708qilb3f6i5ahkqhq7l";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rbit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rbit";
+      ename = "rbit";
+      version = "0.1.0.20201128.182847";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rbit-0.1.0.20201128.182847.tar";
+        sha256 = "1ajjfkih0dji2mdsvcpdzmb32nv20niryl8x17ki1016302qfvdj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rbit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rcirc-color = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rcirc-color";
+      ename = "rcirc-color";
+      version = "0.4.5.0.20230414.195045";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar";
+        sha256 = "1amlzg7njbmk1kbb569ygx2az7vd7py89z9aq9cmf5rm15hjsm59";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rcirc-menu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rcirc-menu";
+      ename = "rcirc-menu";
+      version = "1.1.0.20221221.81818";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rcirc-menu-1.1.0.20221221.81818.tar";
+        sha256 = "0gd19rzqgqb9w5cfpr1rz719k5z1rfkn8480b0h1zkvgpgmdrzbx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rcirc-sqlite = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rcirc-sqlite";
+      ename = "rcirc-sqlite";
+      version = "1.0.2.0.20240606.194313";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar";
+        sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      loc-changes,
+      test-simple,
+    }:
+    elpaBuild {
+      pname = "realgud";
+      ename = "realgud";
+      version = "1.5.1.0.20231113.141045";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar";
+        sha256 = "1nvmpbnx31fdi2ps243xx6cnvhmyv9n1kvb98ydnxydmalxs4iva";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        loc-changes
+        test-simple
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-ipdb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-ipdb";
+      ename = "realgud-ipdb";
+      version = "1.0.0.0.20231216.160636";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20231216.160636.tar";
+        sha256 = "1s08gngzq18bgxdc6qpsg7j9wjqq842wj5bki2l8jgyqpin6g3h5";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-jdb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-jdb";
+      ename = "realgud-jdb";
+      version = "1.0.0.0.20200722.72030";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-jdb-1.0.0.0.20200722.72030.tar";
+        sha256 = "1vh4x50gcy5i9v9pisn0swmv0ighksn8ni68pdwxkns5ka99qqi6";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-lldb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-lldb";
+      ename = "realgud-lldb";
+      version = "1.0.2.0.20230319.171320";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar";
+        sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-node-debug = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-node-debug";
+      ename = "realgud-node-debug";
+      version = "1.0.0.0.20190525.123417";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-node-debug-1.0.0.0.20190525.123417.tar";
+        sha256 = "1s5zav3d0xdj0jggw3znfzb43d9jrnzaafk51wiachh7j673gjjv";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-node-inspect = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-node-inspect";
+      ename = "realgud-node-inspect";
+      version = "1.0.0.0.20190526.154549";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-node-inspect-1.0.0.0.20190526.154549.tar";
+        sha256 = "0hss16d3avyisdxp1xhzjqn2kd9xc3vkqg4ynsgvxampzli78fw9";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-trepan-ni = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-trepan-ni";
+      ename = "realgud-trepan-ni";
+      version = "1.0.1.0.20210513.183733";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-trepan-ni-1.0.1.0.20210513.183733.tar";
+        sha256 = "0p7sc7g1nwg1hyvgx5mzs2qpjnrayp7brw720kzxfxnxdfj7p0gj";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-trepan-xpy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-trepan-xpy";
+      ename = "realgud-trepan-xpy";
+      version = "1.0.1.0.20230322.184556";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/realgud-trepan-xpy-1.0.1.0.20230322.184556.tar";
+        sha256 = "0m9pwqbkhwkm9fys7rs2lapydkinh4v7q3q3j8b0qb0nl8qcni7i";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rec-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rec-mode";
+      ename = "rec-mode";
+      version = "1.9.3.0.20231120.221944";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar";
+        sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rec-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  register-list = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "register-list";
+      ename = "register-list";
+      version = "0.1.0.20221212.230034";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/register-list-0.1.0.20221212.230034.tar";
+        sha256 = "02qc5ll26br1smx5d0ci3wm0s4hdj8sw72xdapn5bql5509n75dx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/register-list.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  relint = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xr,
+    }:
+    elpaBuild {
+      pname = "relint";
+      ename = "relint";
+      version = "1.24.0.20240510.91500";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/relint-1.24.0.20240510.91500.tar";
+        sha256 = "171dnhya0ij5lapn9h2d8ssxx163lwgasvfssd07739171h07389";
+      };
+      packageRequires = [
+        emacs
+        xr
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/relint.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  repology = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "repology";
+      ename = "repology";
+      version = "1.2.4.0.20240108.130348";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar";
+        sha256 = "1ybr0zn647sb6gfqrm6ahdkx3q30j2b0gaab335nkc7jqx1ba565";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/repology.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rich-minority = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rich-minority";
+      ename = "rich-minority";
+      version = "1.0.3.0.20190419.83620";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar";
+        sha256 = "0kx516s0kv8ni3w408hb9bpnig83bv4m1l7b5lhdigmp8zvqm8jm";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rich-minority.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rnc-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rnc-mode";
+      ename = "rnc-mode";
+      version = "0.3.0.20221221.81910";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar";
+        sha256 = "1rdz1g440sjzxcqc4p2s0vv525ala4k470ddn4h9ghljnncqbady";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rt-liberation = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rt-liberation";
+      ename = "rt-liberation";
+      version = "7.0.20240306.83828";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar";
+        sha256 = "1gz0hiwl8qqf1adxwgr8ly98pymqjrl3jjfly5r182l3rwp82gsh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ruby-end = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ruby-end";
+      ename = "ruby-end";
+      version = "0.4.3.0.20230205.12506";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ruby-end-0.4.3.0.20230205.12506.tar";
+        sha256 = "0cr18s311c986gwx12f6fmnqwyqb4fh7j6h8m2cgp767vn4aqwxl";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ruby-end.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rudel = callPackage (
+    {
+      cl-generic,
+      cl-lib ? null,
+      cl-print ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rudel";
+      ename = "rudel";
+      version = "0.3.2.0.20221212.230154";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/rudel-0.3.2.0.20221212.230154.tar";
+        sha256 = "0lcdc0gdqkl4disr9rwn1dmziwaiwnsyhfwvf02vrgpabd7dq95w";
+      };
+      packageRequires = [
+        cl-generic
+        cl-lib
+        cl-print
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rudel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  satchel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "satchel";
+      ename = "satchel";
+      version = "0.2.0.20220223.202624";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar";
+        sha256 = "1x558csdfahlp459m4bb827yayrzgisaijzbpxbl1pjhq595585d";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/satchel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scanner = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scanner";
+      ename = "scanner";
+      version = "0.2.0.20210104.105054";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar";
+        sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scanner.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scroll-restore = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scroll-restore";
+      ename = "scroll-restore";
+      version = "1.0.0.20221221.81959";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/scroll-restore-1.0.0.20221221.81959.tar";
+        sha256 = "04xhshjm5fr5q85srmjhvm20l0zljgbdsy1f3g3lczgzqrwvyg9f";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sed-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sed-mode";
+      ename = "sed-mode";
+      version = "1.1.0.20230721.154631";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sed-mode-1.1.0.20230721.154631.tar";
+        sha256 = "1gb7m8w5v0ay8mcm7alyixsnmndivd24467v58rkj0bpf7bmfa5v";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sed-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  seq = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "seq";
+      ename = "seq";
+      version = "2.24.0.20240201.135317";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/seq-2.24.0.20240201.135317.tar";
+        sha256 = "0plr9pbvzd5cfivj90n0jm920hp2x1giy9889pr8x5bqqnba6j66";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/seq.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  setup = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "setup";
+      ename = "setup";
+      version = "1.4.0.0.20240413.75454";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar";
+        sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/setup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shelisp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shelisp";
+      ename = "shelisp";
+      version = "1.0.0.0.20221212.230255";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/shelisp-1.0.0.0.20221212.230255.tar";
+        sha256 = "0kk24mkmm4imf7gsr7xihj3xf2y9mgy61gpyql0wms1vlmkl0mwk";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shelisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shell-command-plus = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shell-command-plus";
+      ename = "shell-command+";
+      version = "2.4.2.0.20240712.91350";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240712.91350.tar";
+        sha256 = "11qma2a8cph3q87bma8jwb8q4vfqdqs7gmb88yw8ywil76p6jdms";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shell-quasiquote = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shell-quasiquote";
+      ename = "shell-quasiquote";
+      version = "0.0.20221221.82030";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar";
+        sha256 = "0g2yq64yyim35lvxify65kq3y49qrvgri7jyl9rgz8999gb3h8dj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shell-quasiquote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shen-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shen-mode";
+      ename = "shen-mode";
+      version = "0.1.0.20221221.82050";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/shen-mode-0.1.0.20221221.82050.tar";
+        sha256 = "17ygb1c0x52n3cnmvaacrcf7m6qdjxdqaw1pn7lg3899kl45dh3r";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shen-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sisu-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sisu-mode";
+      ename = "sisu-mode";
+      version = "7.1.8.0.20221221.82114";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sisu-mode-7.1.8.0.20221221.82114.tar";
+        sha256 = "1cyynn3sk8wxfhiz5q0lqwq07kqy67s2rvjql62880in5m5r2jpa";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  site-lisp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "site-lisp";
+      ename = "site-lisp";
+      version = "0.1.2.0.20240308.82403";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar";
+        sha256 = "0c9r5pp2lr4wmpcfa8qz0xvq1vhzyhvnn14kawjarhx9p5mvgdq1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/site-lisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sketch-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sketch-mode";
+      ename = "sketch-mode";
+      version = "1.0.4.0.20230420.122954";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sketch-mode-1.0.4.0.20230420.122954.tar";
+        sha256 = "0ssh1v49h94gvchpynvjcsw80swpcdw541zxxhxm5zi6gsnyhnjd";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  slime-volleyball = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "slime-volleyball";
+      ename = "slime-volleyball";
+      version = "1.2.0.0.20221221.82156";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/slime-volleyball-1.2.0.0.20221221.82156.tar";
+        sha256 = "015qpac86km7czpqr2f7xpjlkwbq9s4z9jl0dnr8b2bzh0iwqiik";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sm-c-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sm-c-mode";
+      ename = "sm-c-mode";
+      version = "1.2.0.20240404.93144";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sm-c-mode-1.2.0.20240404.93144.tar";
+        sha256 = "1xbkdvhxaffk6csav2ivbrqv85rkb4arnsslp2ji13alkm5hx1zx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  smalltalk-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "smalltalk-mode";
+      ename = "smalltalk-mode";
+      version = "4.0.0.20221221.82225";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/smalltalk-mode-4.0.0.20221221.82225.tar";
+        sha256 = "1qk0z1gddw7fidvj429ivjwnxb4f5g074r531nmpvmy2l7srchd9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  smart-yank = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "smart-yank";
+      ename = "smart-yank";
+      version = "0.1.1.0.20221221.82231";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar";
+        sha256 = "17w9ybfvdsnsy1vf1mg7a4428rna49i2yfifrp20srj8c0dapwzd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/smart-yank.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sml-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sml-mode";
+      ename = "sml-mode";
+      version = "6.12.0.20230411.5343";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar";
+        sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sml-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  so-long = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "so-long";
+      ename = "so-long";
+      version = "1.1.2.0.20240102.22814";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar";
+        sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/so-long.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  soap-client = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "soap-client";
+      ename = "soap-client";
+      version = "3.2.3.0.20240102.22814";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar";
+        sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/soap-client.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sokoban = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sokoban";
+      ename = "sokoban";
+      version = "1.4.9.0.20220928.185052";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar";
+        sha256 = "1d3s1v81mvfjcq5bbf0338ldxgl2rymqb3vqqw7drbics4jq5fc0";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sokoban.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sotlisp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sotlisp";
+      ename = "sotlisp";
+      version = "1.6.2.0.20220909.50328";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar";
+        sha256 = "1g48ahiwdipk4ckynqipsfradd1qafg59s10jkbpkp3wvfmxi5sf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sotlisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spacious-padding = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spacious-padding";
+      ename = "spacious-padding";
+      version = "0.5.0.0.20240429.82953";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240429.82953.tar";
+        sha256 = "0k5w5d9prlasvv6074nxl8782mbhhvccpkc1zjrp228frkbgfpmi";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spinner = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spinner";
+      ename = "spinner";
+      version = "1.7.4.0.20220915.94959";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar";
+        sha256 = "1110bxj7vgai0wgsqbd9917k72xmalyfy0rlwqp46azg02ljam6j";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/spinner.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-beeline = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-beeline";
+      ename = "sql-beeline";
+      version = "0.2.0.20221221.82329";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sql-beeline-0.2.0.20221221.82329.tar";
+        sha256 = "0qfw9q5isyjywlm2fyaazci24jza6h4s50i0zmjk35j6spyxwffs";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-cassandra = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-cassandra";
+      ename = "sql-cassandra";
+      version = "0.2.2.0.20221221.82336";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar";
+        sha256 = "1rl2bdjyglzssm00zdfqidd9j7jzizxaq60bclqa5dsz80zsd6aq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-indent = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-indent";
+      ename = "sql-indent";
+      version = "1.7.0.20240323.40057";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar";
+        sha256 = "0zrsglgw2zjxn9810r022kanvfj0zrhvr696yxlnvd05f9hv9bpp";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-indent.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-smie = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-smie";
+      ename = "sql-smie";
+      version = "0.0.20221221.82351";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sql-smie-0.0.20221221.82351.tar";
+        sha256 = "05jv2k9gswwwyi19da8d5f176lb81qmnf94dvghyzh272v9iwvkr";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-smie.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  srht = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+      transient,
+    }:
+    elpaBuild {
+      pname = "srht";
+      ename = "srht";
+      version = "0.4.0.20240506.104337";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/srht-0.4.0.20240506.104337.tar";
+        sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0";
+      };
+      packageRequires = [
+        emacs
+        plz
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/srht.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ssh-deploy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ssh-deploy";
+      ename = "ssh-deploy";
+      version = "3.1.16.0.20230702.92809";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar";
+        sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  standard-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "standard-themes";
+      ename = "standard-themes";
+      version = "2.0.1.0.20240520.83250";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240520.83250.tar";
+        sha256 = "08lb47hilg5dniqxlxp773s16m0shqmglcrf1qdm48ddg05911gx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/standard-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  stream = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "stream";
+      ename = "stream";
+      version = "2.3.0.0.20230908.74447";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar";
+        sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/stream.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  substitute = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "substitute";
+      ename = "substitute";
+      version = "0.3.1.0.20240522.34122";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar";
+        sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/substitute.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "svg";
+      ename = "svg";
+      version = "1.1.0.20240102.22814";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/svg-1.1.0.20240102.22814.tar";
+        sha256 = "1ddz3zadwmm4am2ywwmrqj2a56kr73i45q7svjmgnljgvvs267b3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg-clock = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      svg,
+    }:
+    elpaBuild {
+      pname = "svg-clock";
+      ename = "svg-clock";
+      version = "1.2.0.20221221.82408";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar";
+        sha256 = "15fshgjqv3995f2339rwvjw9vyiqz2lfs9h80gkmssha7fdfw3qx";
+      };
+      packageRequires = [
+        emacs
+        svg
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg-clock.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg-lib = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "svg-lib";
+      ename = "svg-lib";
+      version = "0.3.0.20240219.161327";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240219.161327.tar";
+        sha256 = "1qycnhjinmn1smajsniz34kv7jkl4gycjhsl6mxxjhq0432cw2fc";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg-lib.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg-tag-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      svg-lib,
+    }:
+    elpaBuild {
+      pname = "svg-tag-mode";
+      ename = "svg-tag-mode";
+      version = "0.3.2.0.20240624.85758";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar";
+        sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln";
+      };
+      packageRequires = [
+        emacs
+        svg-lib
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  swiper = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "swiper";
+      ename = "swiper";
+      version = "0.14.2.0.20240520.120545";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar";
+        sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma";
+      };
+      packageRequires = [
+        emacs
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/swiper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  switchy-window = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "switchy-window";
+      ename = "switchy-window";
+      version = "1.3.0.20230411.180529";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar";
+        sha256 = "1h3jib0qr8wj3xk3qha5yrw2vqhidnqhj4jhw2smrfk61vyfs83b";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/switchy-window.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sxhkdrc-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sxhkdrc-mode";
+      ename = "sxhkdrc-mode";
+      version = "1.0.0.0.20240117.30132";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar";
+        sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  system-packages = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "system-packages";
+      ename = "system-packages";
+      version = "1.0.13.0.20230908.453";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/system-packages-1.0.13.0.20230908.453.tar";
+        sha256 = "0qh4z6sik94hkms5nfharx2y8np2a1a2r9yrf8lw6xihdnd7bfcv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/system-packages.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  systemd = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "systemd";
+      ename = "systemd";
+      version = "0.0.20221221.82418";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/systemd-0.0.20221221.82418.tar";
+        sha256 = "1ir3y4w2x1cl24zy66yym5rlpffgrcs10x4sxhb2sgg5k4d88scn";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/systemd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tNFA = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "tNFA";
+      ename = "tNFA";
+      version = "0.1.1.0.20240405.140856";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20240405.140856.tar";
+        sha256 = "0m2lh50bz56j5gdpjvan0sksgnlb3cszb28q69xni88hajacn4aw";
+      };
+      packageRequires = [
+        cl-lib
+        queue
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tNFA.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tam = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tam";
+      ename = "tam";
+      version = "0.1.0.20230920.103516";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar";
+        sha256 = "01w1vwb1ajmbk90c79wc0dc367sy5b5qdf471zr0xinajfv47709";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tam.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  taxy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "taxy";
+      ename = "taxy";
+      version = "0.10.1.0.20220919.160646";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/taxy-0.10.1.0.20220919.160646.tar";
+        sha256 = "0bld0sjni4ipbllrjnlwk5419454ac5s3mf6imw91z4ddk46vp18";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/taxy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  taxy-magit-section = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      magit-section,
+      taxy,
+    }:
+    elpaBuild {
+      pname = "taxy-magit-section";
+      ename = "taxy-magit-section";
+      version = "0.14pre0.20240703.212805";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14pre0.20240703.212805.tar";
+        sha256 = "0sdjfryyg0lgr8mry0v662j9m3kaqcap6f73s4ds81yc67y30qbg";
+      };
+      packageRequires = [
+        emacs
+        magit-section
+        taxy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  temp-buffer-browse = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "temp-buffer-browse";
+      ename = "temp-buffer-browse";
+      version = "1.5.0.20160804.124501";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar";
+        sha256 = "0jw3fjbnbbrsz54hmg4rhcwrl0ag7h6873n2kdph3gjds29d8jxp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tempel = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tempel";
+      ename = "tempel";
+      version = "1.1.0.20240708.212025";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240708.212025.tar";
+        sha256 = "0jlqq91w8rwqkd6knqlpw9218xqblfqw253406q4an820rxkzx7l";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tempel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  test-simple = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "test-simple";
+      ename = "test-simple";
+      version = "1.3.0.0.20230916.123447";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20230916.123447.tar";
+        sha256 = "1xbf63qg17va0qwq2mkg12jg1fk6wwrs43jjzxxccx28h6d205il";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/test-simple.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tex-item = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tex-item";
+      ename = "tex-item";
+      version = "0.1.0.20240617.174820";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tex-item-0.1.0.20240617.174820.tar";
+        sha256 = "17b95npakxjzc03qrsxla5jhdzhq0clwdrx57f9ck94a0fnpji3x";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tex-item.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tex-parens = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tex-parens";
+      ename = "tex-parens";
+      version = "0.4.0.20240630.70456";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tex-parens-0.4.0.20240630.70456.tar";
+        sha256 = "0rz6qmmmfajndq3irvrfvmjp1l3j0cfkz5fp36nabyrpj0v8g821";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tex-parens.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  theme-buffet = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "theme-buffet";
+      ename = "theme-buffet";
+      version = "0.1.2.0.20240105.165329";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar";
+        sha256 = "1p1vmyl2cdm6vk45884jhrxjgd53mdch4wfkd1hx269v76zl58pa";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/theme-buffet.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  timerfunctions = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "timerfunctions";
+      ename = "timerfunctions";
+      version = "1.4.2.0.20221221.82440";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar";
+        sha256 = "08spli0dfi882wrjcxjgk3zl4g4b5rlrvpyjmkgkzq6ix5z7w80j";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tiny = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tiny";
+      ename = "tiny";
+      version = "0.2.1.0.20220910.192941";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tiny-0.2.1.0.20220910.192941.tar";
+        sha256 = "04ybgq2ppzjpindwgypsp4sb0hmzq5k7sg9niyp18dxkj0nv1l7n";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tiny.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tmr = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tmr";
+      ename = "tmr";
+      version = "0.4.0.0.20240117.30342";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar";
+        sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tmr.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tomelr = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      map,
+      seq,
+    }:
+    elpaBuild {
+      pname = "tomelr";
+      ename = "tomelr";
+      version = "0.4.3.0.20220511.213722";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tomelr-0.4.3.0.20220511.213722.tar";
+        sha256 = "0vjhbz8lfhk84kgm8vd9lfn9qx60g40j7n3kx7iadk0p4842fpaa";
+      };
+      packageRequires = [
+        emacs
+        map
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tomelr.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  topspace = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "topspace";
+      ename = "topspace";
+      version = "0.3.1.0.20230106.94110";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar";
+        sha256 = "179k6d4v4lw66gpb2lmf1zcz6ww1fr3ys0x992wd1r7mvlc070s8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/topspace.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  track-changes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "track-changes";
+      ename = "track-changes";
+      version = "1.2.0.20240604.221628";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar";
+        sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/track-changes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tramp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tramp";
+      ename = "tramp";
+      version = "2.7.1.0.20240629.82953";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tramp-2.7.1.0.20240629.82953.tar";
+        sha256 = "0kf7l5v84hqhbxzvg6xmffs8b03shd6062wjxfxy9z8y9xb6zpar";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tramp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tramp-nspawn = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tramp-nspawn";
+      ename = "tramp-nspawn";
+      version = "1.0.1.0.20220923.120957";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar";
+        sha256 = "0mpr7d5vgfwsafbmj8lqc1k563b7qnjz1zq73rl8rb2km5jxczhn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tramp-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tramp-theme";
+      ename = "tramp-theme";
+      version = "0.2.0.20221221.82451";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar";
+        sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  transcribe = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "transcribe";
+      ename = "transcribe";
+      version = "1.5.2.0.20221221.82457";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/transcribe-1.5.2.0.20221221.82457.tar";
+        sha256 = "12xw9vxzqfr3pis49apdzc5bg0n30wfx0xa9kycdbcpda88f3z6h";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/transcribe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  transient = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "transient";
+      ename = "transient";
+      version = "0.7.2.0.20240629.150812";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/transient-0.7.2.0.20240629.150812.tar";
+        sha256 = "02d73zfxcbk2p5pzs5j2hv0qznj2zbjyjd6xhinpxx657w1c3zsx";
+      };
+      packageRequires = [
+        compat
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/transient.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  transient-cycles = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "transient-cycles";
+      ename = "transient-cycles";
+      version = "1.0.0.20220410.130412";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar";
+        sha256 = "1rmgmlbjig866gr5jr89mv8ikvpf0p0pcgpa236nmiw3j6jsywa8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tree-inspector = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      treeview,
+    }:
+    elpaBuild {
+      pname = "tree-inspector";
+      ename = "tree-inspector";
+      version = "0.4.0.20240322.113138";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar";
+        sha256 = "15k30zdbr8cr88z00dn2jfnybrhkmp769pc361v9n4mdgapwmiap";
+      };
+      packageRequires = [
+        emacs
+        treeview
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  trie = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      heap,
+      lib,
+      tNFA,
+    }:
+    elpaBuild {
+      pname = "trie";
+      ename = "trie";
+      version = "0.6.0.20231015.13107";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/trie-0.6.0.20231015.13107.tar";
+        sha256 = "0kwz7b7y90yq676r09h4w0wbrm61030sw6mqhrcq9130s107lbkx";
+      };
+      packageRequires = [
+        heap
+        tNFA
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/trie.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  triples = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "triples";
+      ename = "triples";
+      version = "0.3.5.0.20240201.233852";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar";
+        sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/triples.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  typo = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "typo";
+      ename = "typo";
+      version = "1.0.1.0.20230730.150555";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar";
+        sha256 = "0cjn2lh0949kc6c9fxknzg2fyb4p3iwic2a9md5yxpdl42j24fvw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/typo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ulisp-repl = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ulisp-repl";
+      ename = "ulisp-repl";
+      version = "1.0.3.0.20230604.111559";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar";
+        sha256 = "0b6yvlwikgkkfqklrhbcs0p6y349b6700x78n77xf0kkgv7mca1i";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  undo-tree = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "undo-tree";
+      ename = "undo-tree";
+      version = "0.8.2.0.20220312.180415";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar";
+        sha256 = "1gm5108p4qv7v4dqpxkd3zb2h5w8nsz0xjbxzxpkvykqp982g030";
+      };
+      packageRequires = [
+        emacs
+        queue
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/undo-tree.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  uni-confusables = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "uni-confusables";
+      ename = "uni-confusables";
+      version = "0.3.0.20221212.230830";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/uni-confusables-0.3.0.20221212.230830.tar";
+        sha256 = "15kc12zih2d6lazcqgiaq9jc5zgznnhaywh7ibflwc6siqvwxzvg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  uniquify-files = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "uniquify-files";
+      ename = "uniquify-files";
+      version = "1.0.4.0.20221221.82507";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar";
+        sha256 = "0zn7z3y7f7hw4144ssa398455091qrg238wp9fr53l2rxpdkdkwf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  urgrep = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "urgrep";
+      ename = "urgrep";
+      version = "0.5.1snapshot0.20240530.111648";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240530.111648.tar";
+        sha256 = "160h7jzbkf1igaz49sp9gw30471qmw9b28h2pq9r8f1varkvy9an";
+      };
+      packageRequires = [
+        compat
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/urgrep.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  url-http-ntlm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+      ntlm ? null,
+    }:
+    elpaBuild {
+      pname = "url-http-ntlm";
+      ename = "url-http-ntlm";
+      version = "2.0.5.0.20231024.31412";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar";
+        sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+        ntlm
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  url-http-oauth = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "url-http-oauth";
+      ename = "url-http-oauth";
+      version = "0.8.3.0.20230510.175959";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar";
+        sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/url-http-oauth.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  url-scgi = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "url-scgi";
+      ename = "url-scgi";
+      version = "0.9.0.20231222.161107";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar";
+        sha256 = "1dgi0r0igwsk3mx6b7mvd6xz7dmb545g2394s0wh9kkjhlkyd5b3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/url-scgi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  use-package = callPackage (
+    {
+      bind-key,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "use-package";
+      ename = "use-package";
+      version = "2.4.5.0.20240708.120317";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240708.120317.tar";
+        sha256 = "1kp1mh2hm6yhwchkr1vxpnnajdc378knwkmf88vky2ygnnscczy7";
+      };
+      packageRequires = [
+        bind-key
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/use-package.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  validate = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "validate";
+      ename = "validate";
+      version = "1.0.4.0.20180215.204244";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/validate-1.0.4.0.20180215.204244.tar";
+        sha256 = "1hayzx6x2xqfzg84ik5n5x84ixmwc0kc8h7f0796d4rfiljl4y3c";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/validate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  valign = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "valign";
+      ename = "valign";
+      version = "3.1.1.0.20210501.211155";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar";
+        sha256 = "1w5by0y4552c2qlm708b3523fp9sgizd0zxrwk2k1v6qwh04pa67";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/valign.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-backup = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-backup";
+      ename = "vc-backup";
+      version = "1.1.0.0.20220825.144758";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar";
+        sha256 = "1jd3mv5467vy3ddrrhsv6nwsmyksqls5zhnb8hjb6imrhsylprbv";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-backup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-got = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-got";
+      ename = "vc-got";
+      version = "1.2.0.20230129.104658";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar";
+        sha256 = "0dwigmr1rm8a80ngx25jrqlgnbdj51db6avmyg3v7avhkyg5x455";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-got.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-hgcmd = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-hgcmd";
+      ename = "vc-hgcmd";
+      version = "1.14.1.0.20230605.161947";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar";
+        sha256 = "1qrrbr7qgbsc00mrbslaa0k6n3dnighw5dq3mx1hlgz0flm623gi";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vcard = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vcard";
+      ename = "vcard";
+      version = "0.2.2.0.20230718.145809";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar";
+        sha256 = "14rc6glk0wyfjymiv2h5db0cxpl7j8i7h3xlm5bhvgiab00vhk6x";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vcard.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vcl-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vcl-mode";
+      ename = "vcl-mode";
+      version = "1.1.0.20201127.191542";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vcl-mode-1.1.0.20201127.191542.tar";
+        sha256 = "1fjf37s5yfivjbagw7m83y7z5i3dfzqnhcaga7r092v9jvkabw51";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vdiff = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      hydra,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vdiff";
+      ename = "vdiff";
+      version = "0.2.4.0.20230620.220116";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar";
+        sha256 = "1974s441i7hvz6jly2xzndrfpp94nidhkb6gjgfk9f5lml1z17n1";
+      };
+      packageRequires = [
+        emacs
+        hydra
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vdiff.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  verilog-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "verilog-mode";
+      ename = "verilog-mode";
+      version = "2024.3.1.121933719.0.20240707.154630";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240707.154630.tar";
+        sha256 = "1sh1piff0jiahn7w9i607l6j28g74ysylr3n7xrp59nh07y2br6b";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/verilog-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vertico = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vertico";
+      ename = "vertico";
+      version = "1.8.0.20240711.185118";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240711.185118.tar";
+        sha256 = "1wsybijh4h46swlxx7viz0wiwh5hbkh4q3a51r60flvys90cjkgz";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vertico.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vertico-posframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      posframe,
+      vertico,
+    }:
+    elpaBuild {
+      pname = "vertico-posframe";
+      ename = "vertico-posframe";
+      version = "0.7.7.0.20240202.84736";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar";
+        sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k";
+      };
+      packageRequires = [
+        emacs
+        posframe
+        vertico
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vertico-posframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vigenere = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vigenere";
+      ename = "vigenere";
+      version = "1.0.0.20221221.82600";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar";
+        sha256 = "03zkmvx6cs5s0plbafb40pxs0rqx1vz12ql03zlx21h0zwgynqwf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vigenere.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  visual-filename-abbrev = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "visual-filename-abbrev";
+      ename = "visual-filename-abbrev";
+      version = "1.2.0.20221221.82606";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.2.0.20221221.82606.tar";
+        sha256 = "1lb02jpljj2l1qkmn2pmbvw910nrpg9bsz6yfqfccyppvnmrv788";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  visual-fill = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "visual-fill";
+      ename = "visual-fill";
+      version = "0.2.0.20240424.95324";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/visual-fill-0.2.0.20240424.95324.tar";
+        sha256 = "1vgfa29gl4rh6gx08r1imlabznrlmx21p41ns62w9lxi6y8hzf8y";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/visual-fill.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vlf = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vlf";
+      ename = "vlf";
+      version = "1.7.2.0.20231016.224412";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar";
+        sha256 = "1smcw9x38cl7pnxdzy8ycx6g80yb5k0qd7x1520wzbp1g31dsar1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vlf.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vundo = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vundo";
+      ename = "vundo";
+      version = "2.3.0.0.20240425.211317";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar";
+        sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vundo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wcheck-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wcheck-mode";
+      ename = "wcheck-mode";
+      version = "2021.0.20220101.81620";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20220101.81620.tar";
+        sha256 = "15785pi3fgfdi3adsa4lhsbdqw6bnfcm44apxpfixqfx56d3xh8m";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wconf = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wconf";
+      ename = "wconf";
+      version = "0.2.1.0.20201202.220257";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar";
+        sha256 = "0nnf2jak4hjzj2m2v44ymnyvsgiyzz49nnz48j3cpiw7vpb79ibh";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wconf.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  web-server = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "web-server";
+      ename = "web-server";
+      version = "0.1.2.0.20210811.22503";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar";
+        sha256 = "1d2ij23gswvg41xgdg51m2prqn1f9lcwb2rb9rh3s9p6skj14y9b";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/web-server.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  webfeeder = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "webfeeder";
+      ename = "webfeeder";
+      version = "1.1.2.0.20210605.74155";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar";
+        sha256 = "1xcaycimshijmyq071i5qch3idjfl3g4sws9ig97a9hx3m5wfi53";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/webfeeder.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  websocket = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "websocket";
+      ename = "websocket";
+      version = "1.15.0.20230808.230535";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/websocket-1.15.0.20230808.230535.tar";
+        sha256 = "15xry8bv9vcc470j3an5ks9z2hg7ia4nl7x4xvqb77rpbkq53rb9";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/websocket.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  which-key = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "which-key";
+      ename = "which-key";
+      version = "3.6.0.0.20240625.112213";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240625.112213.tar";
+        sha256 = "1shjn6bqnwr8fxccfz86dpwvyqw0crmrn7pb60dwvvjmxqfm0aj6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/which-key.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  window-commander = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "window-commander";
+      ename = "window-commander";
+      version = "3.0.2.0.20240314.125442";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar";
+        sha256 = "082fwi8basfddwvi5yjgvdbf0f7xh58kmbvshnpim143pyxzgi9q";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/window-commander.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  window-tool-bar = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "window-tool-bar";
+      ename = "window-tool-bar";
+      version = "0.2.1.0.20240609.122134";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20240609.122134.tar";
+        sha256 = "1xfwirfdy69c349052jx31c3ib708mwl68458lj8dar5y2cqwk0q";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  windower = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "windower";
+      ename = "windower";
+      version = "0.0.1.0.20200212.91532";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar";
+        sha256 = "1s9kq9256x8chayqfcczxfcdb67pk6752xg7v6ixb9f3ad590ls2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/windower.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  windresize = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "windresize";
+      ename = "windresize";
+      version = "0.1.0.20221221.82616";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/windresize-0.1.0.20221221.82616.tar";
+        sha256 = "0hgfyhz3jx4yhxspvh8zb4s852j8iwijrg7d4madr1p9rm2g3pjq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/windresize.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wisi = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "wisi";
+      ename = "wisi";
+      version = "4.3.2.0.20240313.173240";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar";
+        sha256 = "01i5r77ndxy76gby6v4j25w4pf6kmqaxagya29b9gnrnw07m8n5b";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wisi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wisitoken-grammar-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      mmm-mode,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "wisitoken-grammar-mode";
+      ename = "wisitoken-grammar-mode";
+      version = "1.3.0.0.20231023.83923";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar";
+        sha256 = "0ai5s1sgy0wk8hc84w7da65p30ldk514n2h6hqa71f9ia5jbd0j8";
+      };
+      packageRequires = [
+        emacs
+        mmm-mode
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wpuzzle = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wpuzzle";
+      ename = "wpuzzle";
+      version = "1.1.0.20221221.82918";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/wpuzzle-1.1.0.20221221.82918.tar";
+        sha256 = "0ky8n0xjxsw4a684g3l8imbrfsvbc9nq1i8gi1y384qjvvjqxaxv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wrap-search = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wrap-search";
+      ename = "wrap-search";
+      version = "4.16.13.0.20240517.214404";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/wrap-search-4.16.13.0.20240517.214404.tar";
+        sha256 = "14rk7gyab0m19z0rhrpqcfdqrdrbz9v5zw36rkn5qxzrpv6cw7hq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wrap-search.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xclip = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xclip";
+      ename = "xclip";
+      version = "1.11.0.20221221.82941";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar";
+        sha256 = "18l69h1vg98fd35hsbbzdlhgmilyj192g9vr34kkwzj0r6bak4l2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xclip.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xeft = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xeft";
+      ename = "xeft";
+      version = "3.3.0.20230913.220528";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar";
+        sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xeft.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xelb = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xelb";
+      ename = "xelb";
+      version = "0.20.0.20240708.212415";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xelb-0.20.0.20240708.212415.tar";
+        sha256 = "0sv3p1q3gc9jpjvnl9pjr98kzl3i969hmqbznpby1fgdrlbinvik";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xelb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xpm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "xpm";
+      ename = "xpm";
+      version = "1.0.5.0.20230911.4618";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xpm-1.0.5.0.20230911.4618.tar";
+        sha256 = "0ymby7wqz6bmn4kcl0if0ybhafba139pgmzifvk00bh7r0s5gsz9";
+      };
+      packageRequires = [
+        cl-lib
+        queue
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xpm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xr = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xr";
+      ename = "xr";
+      version = "1.25.0.20240401.74532";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xr-1.25.0.20240401.74532.tar";
+        sha256 = "0q9s706dz52mfnjhc9b5km7756zsx9ws4nlc607i1v71hhz2k3lg";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xr.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xref = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xref";
+      ename = "xref";
+      version = "1.7.0.0.20240707.154630";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar";
+        sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xref.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xref-union = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xref-union";
+      ename = "xref-union";
+      version = "0.2.0.0.20231225.162837";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar";
+        sha256 = "0is4r12r30drq1msa5143bgnwam1kgbf2iia30fbqv0l0rhvqd9x";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xref-union.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yasnippet = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "yasnippet";
+      ename = "yasnippet";
+      version = "0.14.1.0.20240406.91451";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar";
+        sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/yasnippet.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yasnippet-classic-snippets = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      yasnippet,
+    }:
+    elpaBuild {
+      pname = "yasnippet-classic-snippets";
+      ename = "yasnippet-classic-snippets";
+      version = "1.0.2.0.20221221.83103";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/yasnippet-classic-snippets-1.0.2.0.20221221.83103.tar";
+        sha256 = "01066fmg42031naaqpy1ls8xw8k2hq02sib43smx20wdbqak6gx7";
+      };
+      packageRequires = [ yasnippet ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zones = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "zones";
+      ename = "zones";
+      version = "2023.6.11.0.20231018.110342";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/zones-2023.6.11.0.20231018.110342.tar";
+        sha256 = "0gyla7n7znzhxfdwb9jmxkijvidpxvqs9p68dbaiyk86daq2pxzm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/zones.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ztree = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ztree";
+      ename = "ztree";
+      version = "1.0.6.0.20230617.194317";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20230617.194317.tar";
+        sha256 = "1zh6qdzalvikb48dc0pk3rnk7jvknx07dkrggc259q61jdp3pj1m";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ztree.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zuul = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "zuul";
+      ename = "zuul";
+      version = "0.4.0.0.20230524.131806";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar";
+        sha256 = "1pvfi8dp5i6h7z35h91408pz8bsval35sd7dk02v0hr6znln0pvb";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/zuul.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
index c6b398ad29972..a0fdf0e1cbc72 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
@@ -22,7 +22,7 @@ formats commits for you.
 
 */
 
-{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:
+{ lib, pkgs, buildPackages }:
 
 self: let
 
@@ -32,11 +32,6 @@ self: let
     });
   };
 
-  elpaBuild = import ../build-support/elpa.nix {
-    inherit lib stdenv texinfo writeText gcc;
-    inherit (self) emacs;
-  };
-
   # Use custom elpa url fetcher with fallback/uncompress
   fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
 
@@ -99,6 +94,6 @@ self: let
 
     elpaDevelPackages = super // overrides;
 
-  in elpaDevelPackages // { inherit elpaBuild; });
+  in elpaDevelPackages);
 
 in generateElpa { }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index af51794d05b64..9610c40702628 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -1,6914 +1,10388 @@
 { callPackage }:
-  {
-    ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ace-window";
-        ename = "ace-window";
-        version = "0.10.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar";
-          sha256 = "1sdzk1hgi3axqqbxf6aq1v5j3d8bybkz40dk8zqn49xxxfmzbdv4";
-        };
-        packageRequires = [ avy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ace-window.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ack = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ack";
-        ename = "ack";
-        version = "1.11";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ack-1.11.tar";
-          sha256 = "1ji02v3qis5sx7hpaaxksgh2jqxzzilagz6z33kjb1lds1sq4z2c";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ack.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    activities = callPackage ({ elpaBuild, emacs, fetchurl, lib, persist }:
-      elpaBuild {
-        pname = "activities";
-        ename = "activities";
-        version = "0.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/activities-0.7.tar";
-          sha256 = "1775cdk9hv257m6l7icg247fc36g7lwgjg8iivj52m6qg7p7cz9g";
-        };
-        packageRequires = [ emacs persist ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/activities.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ada-mode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , gnat-compiler
-                            , lib
-                            , uniquify-files
-                            , wisi }:
-      elpaBuild {
-        pname = "ada-mode";
-        ename = "ada-mode";
-        version = "8.1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar";
-          sha256 = "10k514al716qjx3qg1m4k1rnf70fa73vrmmx3pp75zrw1d0db9y6";
-        };
-        packageRequires = [ emacs gnat-compiler uniquify-files wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ada-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ada-ref-man";
-        ename = "ada-ref-man";
-        version = "2020.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar";
-          sha256 = "0ijgl9lnmn8n3pllgh3apl2shbl38f3fxn8z5yy4q6pqqx0vr3fn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "adaptive-wrap";
-        ename = "adaptive-wrap";
-        version = "0.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar";
-          sha256 = "1dz5mi21v2wqh969m3xggxbzq3qf78hps418rzl73bb57l837qp8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    adjust-parens = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "adjust-parens";
-        ename = "adjust-parens";
-        version = "3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar";
-          sha256 = "1gdlykg7ix3833s40152p1ji4r1ycp18niqjr1f994y4ydqxq8yl";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    advice-patch = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "advice-patch";
-        ename = "advice-patch";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/advice-patch-0.1.tar";
-          sha256 = "0km891648k257k4d6hbrv6jyz9663kww8gfarvzf9lv8i4qa5scp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/advice-patch.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aggressive-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "aggressive-completion";
-        ename = "aggressive-completion";
-        version = "1.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar";
-          sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aggressive-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "aggressive-indent";
-        ename = "aggressive-indent";
-        version = "1.10.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar";
-          sha256 = "1c27g9qhqc4bh96bkxdcjbrhiwi7kzki1l4yhxvyvwwarisl6c7b";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ahungry-theme";
-        ename = "ahungry-theme";
-        version = "1.10.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar";
-          sha256 = "16k6wm1qss5bk45askhq5vswrqsjic5dijpkgnmwgvm8xsdlvni6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aircon-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "aircon-theme";
-        ename = "aircon-theme";
-        version = "0.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar";
-          sha256 = "0dcnlk3q95bcghlwj8ii40xxhspnfbqcr9mvj1v3adl1s623fyp0";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    all = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "all";
-        ename = "all";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/all-1.1.tar";
-          sha256 = "067c5ynklw1inbjwd1l6dkbpx3vw487qv39y7mdl55a6nqx7hgk4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/all.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "altcaps";
-        ename = "altcaps";
-        version = "1.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar";
-          sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/altcaps.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ampc = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ampc";
-        ename = "ampc";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ampc-0.2.tar";
-          sha256 = "17l2c5hr7cq0vf4qc8s2adwlhqp74glc4v909h0jcavrnbn8yn80";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ampc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "arbitools";
-        ename = "arbitools";
-        version = "0.977";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/arbitools-0.977.tar";
-          sha256 = "0s5dpprx24fxm0qk8nzm39c16ydiq97wzz3l7zi69r3l9wf31rb3";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/arbitools.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ascii-art-to-unicode";
-        ename = "ascii-art-to-unicode";
-        version = "1.13";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.tar";
-          sha256 = "0qlh8zi691gz7s1ayp1x5ga3sj3rfy79y21r6hqf696mrkgpz1d8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    assess = callPackage ({ elpaBuild, emacs, fetchurl, lib, m-buffer }:
-      elpaBuild {
-        pname = "assess";
-        ename = "assess";
-        version = "0.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/assess-0.7.tar";
-          sha256 = "1wka2idr63bn8fgh0cz4lf21jvlhkr895y0xnh3syp9vrss5hzsp";
-        };
-        packageRequires = [ emacs m-buffer ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/assess.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    async = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "async";
-        ename = "async";
-        version = "1.9.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/async-1.9.8.tar";
-          sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/async.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "auctex";
-        ename = "auctex";
-        version = "14.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar";
-          sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auctex-cont-latexmk = callPackage ({ auctex
-                                       , elpaBuild
-                                       , emacs
-                                       , fetchurl
-                                       , lib }:
-      elpaBuild {
-        pname = "auctex-cont-latexmk";
-        ename = "auctex-cont-latexmk";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar";
-          sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auctex-label-numbers = callPackage ({ auctex
-                                        , elpaBuild
-                                        , emacs
-                                        , fetchurl
-                                        , lib }:
-      elpaBuild {
-        pname = "auctex-label-numbers";
-        ename = "auctex-label-numbers";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar";
-          sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "aumix-mode";
-        ename = "aumix-mode";
-        version = "7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/aumix-mode-7.tar";
-          sha256 = "08baz31hm0nhikqg5h294kg5m4qkiayjhirhb57v57g5722jfk3m";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-correct = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "auto-correct";
-        ename = "auto-correct";
-        version = "1.1.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.tar";
-          sha256 = "05ky3qxbvxrkywpqj6syl7ll6za74fhjzrcia6wdmxsnjya5qbf1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-correct.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-header = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "auto-header";
-        ename = "auto-header";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auto-header-0.1.2.tar";
-          sha256 = "0p22bpdy29i7ff8rzjh1qzvj4d8igl36gs1981kmds4qz23qn447";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-header.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "auto-overlays";
-        ename = "auto-overlays";
-        version = "0.10.10";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar";
-          sha256 = "0jn7lk8vzdrf0flxwwx295z0mrghd3lyspfadwz35c6kygvy8078";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    autocrypt = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "autocrypt";
-        ename = "autocrypt";
-        version = "0.4.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/autocrypt-0.4.2.tar";
-          sha256 = "0mc4vb6x7qzn29dg9m05zgli6mwh9cj4vc5n6hvarzkn9lxl6mr3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/autocrypt.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "avy";
-        ename = "avy";
-        version = "0.5.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/avy-0.5.0.tar";
-          sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/avy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bbdb";
-        ename = "bbdb";
-        version = "3.2.2.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar";
-          sha256 = "1ymjydf54z3rbkxk4irvan5s8lc8wdhk01691741vfznx0nsc4a2";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bbdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "beacon";
-        ename = "beacon";
-        version = "1.3.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar";
-          sha256 = "1hxb6vyvpppj7yzphknmh8m4a1h89lg6jr98g4d62k0laxazvdza";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/beacon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "beframe";
-        ename = "beframe";
-        version = "1.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar";
-          sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/beframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bicep-ts-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "bicep-ts-mode";
-        ename = "bicep-ts-mode";
-        version = "0.1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.3.tar";
-          sha256 = "02377gsdnfvvydjw014p2y6y74nd5zfh1ghq5l9ayq0ilvv8fmx7";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "bind-key";
-        ename = "bind-key";
-        version = "2.4.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bind-key-2.4.1.tar";
-          sha256 = "0jrbm2l6h4r7qjcdcsfczbijmbf3njzzzrymv08zanchmy7lvsv2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bind-key.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    blist = callPackage ({ elpaBuild, emacs, fetchurl, ilist, lib }:
-      elpaBuild {
-        pname = "blist";
-        ename = "blist";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/blist-0.3.tar";
-          sha256 = "1p10d9q14px19m3vajqmm71lmnbxxsc7qczgq11vhg485c20y3va";
-        };
-        packageRequires = [ emacs ilist ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/blist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bluetooth = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bluetooth";
-        ename = "bluetooth";
-        version = "0.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar";
-          sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bluetooth.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bnf-mode";
-        ename = "bnf-mode";
-        version = "0.4.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar";
-          sha256 = "1x6km8rhhb5bkas3yfmjfpyxlhyxkqnzviw1pqlq88c95j88h3d4";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    boxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "boxy";
-        ename = "boxy";
-        version = "1.1.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar";
-          sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/boxy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    boxy-headings = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "boxy-headings";
-        ename = "boxy-headings";
-        version = "2.1.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar";
-          sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc";
-        };
-        packageRequires = [ boxy emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/boxy-headings.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    breadcrumb = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "breadcrumb";
-        ename = "breadcrumb";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/breadcrumb-1.0.1.tar";
-          sha256 = "1s69a2z183mla4d4b5pcsswbwa3hjvsg1xj7r3hdw6j841b0l9dw";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/breadcrumb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "brief";
-        ename = "brief";
-        version = "5.91";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/brief-5.91.tar";
-          sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb";
-        };
-        packageRequires = [ cl-lib nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/brief.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buffer-env = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "buffer-env";
-        ename = "buffer-env";
-        version = "0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar";
-          sha256 = "08qaw4y1sszhh97ih13vfrm0r1nn1k410f2wwvffvncxhqgxz5lv";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buffer-env.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buffer-expose = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "buffer-expose";
-        ename = "buffer-expose";
-        version = "0.4.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.tar";
-          sha256 = "1ymjjjrbknp3hdfwd8zyzfrsn5n267245ffmplm7yk2s34kgxr0n";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bufferlo";
-        ename = "bufferlo";
-        version = "0.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar";
-          sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bufferlo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "bug-hunter";
-        ename = "bug-hunter";
-        version = "1.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.tar";
-          sha256 = "0cgwq8b6jglbg9ydvf80ijgbbccrks3yb9af46sdd6aqdmvdlx21";
-        };
-        packageRequires = [ cl-lib seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buildbot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "buildbot";
-        ename = "buildbot";
-        version = "0.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar";
-          sha256 = "056jakpyslizsp8sik5f7m90dpcga8y38hb5rh1yfa7k1xwcrrk2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buildbot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    calibre = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "calibre";
-        ename = "calibre";
-        version = "1.4.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar";
-          sha256 = "1ak05y3cmmwpg8bijkwl97kvfxhxh9xxc74askyafc50n0jvaq87";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/calibre.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "cape";
-        ename = "cape";
-        version = "1.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cape-1.5.tar";
-          sha256 = "1kg5a2x23gmdcv8kwzmz8qjfr05r9rfzwb7cj38ambpqpppxl7ij";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "capf-autosuggest";
-        ename = "capf-autosuggest";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar";
-          sha256 = "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    caps-lock = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "caps-lock";
-        ename = "caps-lock";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/caps-lock-1.0.tar";
-          sha256 = "1yy4kjc1zlpzkam0jj8h3v5h23wyv1yfvwj2drknn59d8amc1h4y";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/caps-lock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    captain = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "captain";
-        ename = "captain";
-        version = "1.0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/captain-1.0.3.tar";
-          sha256 = "0l8z8bqk705jdl7gvd2x7nhs0z6gn3swk5yzp3mnhjcfda6whz8l";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/captain.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "chess";
-        ename = "chess";
-        version = "2.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/chess-2.0.5.tar";
-          sha256 = "0dgmp7ymjyb5pa93n05s0d4ql7wk98r9s4f9w35yahgqk9xvqclj";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/chess.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cl-generic = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cl-generic";
-        ename = "cl-generic";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cl-generic-0.3.tar";
-          sha256 = "0dqn484xb25ifiqd9hqdrs954c74akrf95llx23b2kzf051pqh1k";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cl-generic.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cl-lib = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cl-lib";
-        ename = "cl-lib";
-        version = "0.7.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar";
-          sha256 = "1wpdg2zwhzxv4bkx9ldiwd16l6244wakv8yphrws4mnymkxvf2q1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cl-lib.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    clipboard-collector = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "clipboard-collector";
-        ename = "clipboard-collector";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar";
-          sha256 = "0v70f9pljq3jar3d1vpaj48nhrg90jzsvqcbzgv54989w8rvvcd6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cobol-mode";
-        ename = "cobol-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar";
-          sha256 = "0aicx6vvhgn0fvikbq74vnvvwh228pxdqf52sbiffhzgb7pkbvcj";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    code-cells = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "code-cells";
-        ename = "code-cells";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/code-cells-0.4.tar";
-          sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/code-cells.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    colorful-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "colorful-mode";
-        ename = "colorful-mode";
-        version = "1.0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar";
-          sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "comint-mime";
-        ename = "comint-mime";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar";
-          sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/comint-mime.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "compact-docstrings";
-        ename = "compact-docstrings";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.tar";
-          sha256 = "00fjhfysjyqigkg0icxlqw6imzhjk5xhlxmxxs1jiafhn55dbcpj";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/compact-docstrings.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "company";
-        ename = "company";
-        version = "0.10.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-0.10.2.tar";
-          sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "company-ebdb";
-        ename = "company-ebdb";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-ebdb-1.1.tar";
-          sha256 = "1ym0r7y90n4d6grd4l02rxk096gsjmw9j81slig0pq1ky33rb6ks";
-        };
-        packageRequires = [ company ebdb ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company-math = callPackage ({ company
-                                , elpaBuild
-                                , fetchurl
-                                , lib
-                                , math-symbol-lists }:
-      elpaBuild {
-        pname = "company-math";
-        ename = "company-math";
-        version = "1.5.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar";
-          sha256 = "16ya3yscxxmz9agi0nc5pi43wkfv45lh1zd89yqfc7zcw02nsnld";
-        };
-        packageRequires = [ company math-symbol-lists ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company-math.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    company-statistics = callPackage ({ company
-                                      , elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib }:
-      elpaBuild {
-        pname = "company-statistics";
-        ename = "company-statistics";
-        version = "0.2.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar";
-          sha256 = "1gfwhgv7q9d3xjgaim25diyd6jfl9w3j07qrssphcrdxv0q24d14";
-        };
-        packageRequires = [ company emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/company-statistics.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "compat";
-        ename = "compat";
-        version = "30.0.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar";
-          sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/compat.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "consult";
-        ename = "consult";
-        version = "1.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-1.7.tar";
-          sha256 = "02ji5yxa92jj7chs6al5amjdag1waz2sngbbk45mgg9nv81b4d3c";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-denote = callPackage ({ consult
-                                  , denote
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "consult-denote";
-        ename = "consult-denote";
-        version = "0.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar";
-          sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1";
-        };
-        packageRequires = [ consult denote emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-denote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-hoogle = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , haskell-mode
-                                  , lib }:
-      elpaBuild {
-        pname = "consult-hoogle";
-        ename = "consult-hoogle";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar";
-          sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr";
-        };
-        packageRequires = [ emacs haskell-mode ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-recoll = callPackage ({ consult, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "consult-recoll";
-        ename = "consult-recoll";
-        version = "0.8.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar";
-          sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v";
-        };
-        packageRequires = [ consult emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "context-coloring";
-        ename = "context-coloring";
-        version = "8.1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar";
-          sha256 = "0mqdl34g493pps85ckin5i3iz8kwlqkcwjvsf2sj4nldjvvfk1ng";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/context-coloring.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "corfu";
-        ename = "corfu";
-        version = "1.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/corfu-1.4.tar";
-          sha256 = "0jsxrs08zwbwb1mzn8a2ja3wr2w34cx8ca09l4fz05labv7p7i85";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/corfu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "coterm";
-        ename = "coterm";
-        version = "1.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/coterm-1.6.tar";
-          sha256 = "0kgsg99dggirz6asyppwx1ydc0jh62xd1bfhnm2hyby5qkqz1yvk";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/coterm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }:
-      elpaBuild {
-        pname = "counsel";
-        ename = "counsel";
-        version = "0.14.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar";
-          sha256 = "10jajfl2vhqj2awy991kqrf1hcsj8nkvn760cbxjsm2lhzvqqhj3";
-        };
-        packageRequires = [ emacs ivy swiper ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/counsel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cpio-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cpio-mode";
-        ename = "cpio-mode";
-        version = "0.17";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar";
-          sha256 = "13jay5c36svq2r78gwp7d1slpkkzrx749q28554mxd855fr6pvaj";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cpupower = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cpupower";
-        ename = "cpupower";
-        version = "1.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar";
-          sha256 = "155fhf38p95a5ws6jzpczw0z03zwbsqzdwj50v3grjivyp74pddz";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cpupower.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    crdt = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "crdt";
-        ename = "crdt";
-        version = "0.3.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/crdt-0.3.5.tar";
-          sha256 = "038qivbw02h1i98ym0fwx72x05gm0j4h93a54v1l7g25drm5zm83";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/crdt.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    crisp = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "crisp";
-        ename = "crisp";
-        version = "1.3.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/crisp-1.3.6.tar";
-          sha256 = "0am7gwadjp0nwlvf7y4sp9brbm0234k55bnxfv44lkwdf502mq8y";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/crisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    csharp-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "csharp-mode";
-        ename = "csharp-mode";
-        version = "2.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar";
-          sha256 = "1jjxq5vkqq2v8rkcm2ygggpg355aqmrl2hdhh1xma3jlnj5carnf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "csv-mode";
-        ename = "csv-mode";
-        version = "1.25";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.25.tar";
-          sha256 = "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/csv-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "cursory";
-        ename = "cursory";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar";
-          sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cursory.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cycle-quotes";
-        ename = "cycle-quotes";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar";
-          sha256 = "1glf8sd3gqp9qbd238vxd3aprdz93f887893xji3ybqli36i2xs1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cycle-quotes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dape = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }:
-      elpaBuild {
-        pname = "dape";
-        ename = "dape";
-        version = "0.13.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dape-0.13.0.tar";
-          sha256 = "1zzghp73yh1vl9vf3njkqyhh6vmmx6klnd9z37p62467bd19wr8a";
-        };
-        packageRequires = [ emacs jsonrpc ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "darkroom";
-        ename = "darkroom";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/darkroom-0.3.tar";
-          sha256 = "0gxixkai8awc77vzckwljmyapdnxw5j9ajxmlr8rq42994gjr4fm";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/darkroom.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dash";
-        ename = "dash";
-        version = "2.19.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dash-2.19.1.tar";
-          sha256 = "1c7yibfikkwlip8zh4kiamh3kljil3hyl250g8fkxpdyhljjdk6m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dash.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "dbus-codegen";
-        ename = "dbus-codegen";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.tar";
-          sha256 = "0d3sbqs5r8578629inx8nhqvx0kshf41d00c8dpc75v4b2vx0h6w";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }:
-      elpaBuild {
-        pname = "debbugs";
-        ename = "debbugs";
-        version = "0.40";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.40.tar";
-          sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl";
-        };
-        packageRequires = [ emacs soap-client ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/debbugs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "delight";
-        ename = "delight";
-        version = "1.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/delight-1.7.tar";
-          sha256 = "1j7srr0i7s9hcny45m8zmj33nl9g6zi55cbkdzzlbx6si2rqwwlj";
-        };
-        packageRequires = [ cl-lib nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/delight.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    denote = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "denote";
-        ename = "denote";
-        version = "3.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/denote-3.0.6.tar";
-          sha256 = "1wq44r4j624hiwpyzkrrbk998321wzj7x45y9rwy4gpi8f6xi1nv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/denote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    denote-menu = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "denote-menu";
-        ename = "denote-menu";
-        version = "1.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar";
-          sha256 = "042avabc97wgkz85x40dq7rmv4h9n5kmq935lrg9s20klbs9axs1";
-        };
-        packageRequires = [ denote emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/denote-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "detached";
-        ename = "detached";
-        version = "0.10.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/detached-0.10.1.tar";
-          sha256 = "0w6xgidi0g1pc13xfm8hcgmc7i2h5brj443cykwgvr5wkqnpmp9m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/detached.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "devdocs";
-        ename = "devdocs";
-        version = "0.6.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/devdocs-0.6.1.tar";
-          sha256 = "04m3jd3wymrsdlb1i7z6dz9pf1q8q38ihkbn3jisdca6xkk9jd6p";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/devdocs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    devicetree-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "devicetree-ts-mode";
-        ename = "devicetree-ts-mode";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar";
-          sha256 = "06j385pvlhd7hp9isqp5gcf378m8p6578q6nz81r8dx93ymaak79";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dict-tree = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , heap
-                             , lib
-                             , tNFA
-                             , trie }:
-      elpaBuild {
-        pname = "dict-tree";
-        ename = "dict-tree";
-        version = "0.17";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar";
-          sha256 = "0p4j0m3b9i38l4rcgzdps95wqk27zz156d4q73vq054kpcphrfpp";
-        };
-        packageRequires = [ emacs heap tNFA trie ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dict-tree.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "diff-hl";
-        ename = "diff-hl";
-        version = "1.9.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar";
-          sha256 = "0skla012qw55qhzykgrk3zk5x76dfsj11kq8q2msyrq3jxcbyq6p";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diff-hl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diffview = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "diffview";
-        ename = "diffview";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/diffview-1.0.el";
-          sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diffview.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "diminish";
-        ename = "diminish";
-        version = "0.46";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/diminish-0.46.tar";
-          sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diminish.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dired-du";
-        ename = "dired-du";
-        version = "0.5.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar";
-          sha256 = "066yjy9vdbf20adcqdcknk5b0ml18fy2bm9gkgcp0qfg37yy1yjg";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-du.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-duplicates = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dired-duplicates";
-        ename = "dired-duplicates";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dired-duplicates-0.4.tar";
-          sha256 = "1srih47bq7szg6n3qlz4yzzcijg79p8xpwmi5c4v9xscl94nnc4z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dired-git-info";
-        ename = "dired-git-info";
-        version = "0.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.tar";
-          sha256 = "0rryvlbqx1j48wafja15yc39jd0fzgz9i6bzmq9jpql3w9445772";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dired-preview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dired-preview";
-        ename = "dired-preview";
-        version = "0.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar";
-          sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dired-preview.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "disk-usage";
-        ename = "disk-usage";
-        version = "1.3.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.tar";
-          sha256 = "02i7i7mrn6ky3lzhcadvq7wlznd0b2ay107h2b3yh4wwwxjxymyg";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/disk-usage.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "dismal";
-        ename = "dismal";
-        version = "1.5.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar";
-          sha256 = "1706m5ya6q0jf8mzfkqn47aqd7ygm88fm7pvzbd4cry30mjs5vki";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dismal.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    djvu = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "djvu";
-        ename = "djvu";
-        version = "1.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar";
-          sha256 = "0z74aicvy680m1d6v5zk5pcpkd310jqqdxadpjcbnjcybzp1zisq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/djvu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    do-at-point = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "do-at-point";
-        ename = "do-at-point";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar";
-          sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/do-at-point.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "doc-toc";
-        ename = "doc-toc";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar";
-          sha256 = "09xwa0xgnzlaff0j5zy3kam6spcnw0npppc3gf6ka5bizbk4dq99";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/doc-toc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    docbook = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "docbook";
-        ename = "docbook";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/docbook-0.1.tar";
-          sha256 = "1kn71kpyb1maww414zgpc1ccgb02mmaiaix06jyqhf75hfxms2lv";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/docbook.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "drepl";
-        ename = "drepl";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/drepl-0.3.tar";
-          sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds";
-        };
-        packageRequires = [ comint-mime emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/drepl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dts-mode";
-        ename = "dts-mode";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar";
-          sha256 = "16ads9xjbqgmgwzj63anhc6yb1j79qpcnxjafqrzdih1p5j7hrr9";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    easy-escape = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "easy-escape";
-        ename = "easy-escape";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar";
-          sha256 = "0mwam1a7sl90aqgz6mj3zm0w1dq15b5jpxmwxv21xs1imyv696ci";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/easy-escape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "easy-kill";
-        ename = "easy-kill";
-        version = "0.9.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar";
-          sha256 = "1nwhqidy5zq6j867b21zng5ppb7n56drnhn3wjs7hjmkf23r63qy";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/easy-kill.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "ebdb";
-        ename = "ebdb";
-        version = "0.8.22";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar";
-          sha256 = "0nmrhjk2ddml115ibsy8j4crw5hzq9fa94v8y41iyj9h3gf8irzc";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ebdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
-      elpaBuild {
-        pname = "ebdb-gnorb";
-        ename = "ebdb-gnorb";
-        version = "1.0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.tar";
-          sha256 = "1kwcrg268vmskls9p4ccs6ybdip30cb4fw3xzq11gqjch1nssh18";
-        };
-        packageRequires = [ ebdb gnorb ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
-      elpaBuild {
-        pname = "ebdb-i18n-chn";
-        ename = "ebdb-i18n-chn";
-        version = "1.3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar";
-          sha256 = "1qyia40z6ssvnlpra116avakyf81vqn42860ny21g0zsl99a58j2";
-        };
-        packageRequires = [ ebdb pyim ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ediprolog = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ediprolog";
-        ename = "ediprolog";
-        version = "2.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar";
-          sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ediprolog.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "eev";
-        ename = "eev";
-        version = "20240710";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20240710.tar";
-          sha256 = "1mia27ilfg4zkkwvwy3m24ypgi1fm8k27rm77xwjpq87pb2wvr02";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eev.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ef-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ef-themes";
-        ename = "ef-themes";
-        version = "1.7.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar";
-          sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ef-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eglot = callPackage ({ eldoc
-                         , elpaBuild
-                         , emacs
-                         , external-completion
-                         , fetchurl
-                         , flymake ? null
-                         , jsonrpc
-                         , lib
-                         , project
-                         , seq
-                         , xref }:
-      elpaBuild {
-        pname = "eglot";
-        ename = "eglot";
-        version = "1.17";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eglot-1.17.tar";
-          sha256 = "1cnx522wb49f1dkm80sigz3kvzrblmq5b1lnfyq9wdnh6zdm4l00";
-        };
-        packageRequires = [
-          eldoc
-          emacs
-          external-completion
-          flymake
-          jsonrpc
-          project
-          seq
-          xref
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eglot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    el-search = callPackage ({ cl-print ? null
-                             , elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , stream }:
-      elpaBuild {
-        pname = "el-search";
-        ename = "el-search";
-        version = "1.12.6.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar";
-          sha256 = "1vq8cp2icpl8vkc9r8brzbn0mpaj03mnvdz1bdqn8nqrzc3w0h24";
-        };
-        packageRequires = [ cl-print emacs stream ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/el-search.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "eldoc";
-        ename = "eldoc";
-        version = "1.15.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar";
-          sha256 = "05fgk3y2rp0xrm3x0xmf9fm72l442y7ydxxg3xk006d9cq06h8kz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eldoc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "electric-spacing";
-        ename = "electric-spacing";
-        version = "5.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/electric-spacing-5.0.tar";
-          sha256 = "1gr35nri25ycxr0wwkypky8zv43nnfrilx4jaj66mb9jsyix6smi";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "elisp-benchmarks";
-        ename = "elisp-benchmarks";
-        version = "1.16";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.16.tar";
-          sha256 = "0v5db89z6hirvixgjwyz3a9dkx6xf486hy51sprvslki706m08p2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ellama = callPackage ({ compat
-                          , elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , llm
-                          , spinner }:
-      elpaBuild {
-        pname = "ellama";
-        ename = "ellama";
-        version = "0.11.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ellama-0.11.9.tar";
-          sha256 = "0h41hsvz34v0gb9d7d8aw6phc7iyrpbs0r8djsz59yd0ijzbz12j";
-        };
-        packageRequires = [ compat emacs llm spinner ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ellama.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    emacs-gc-stats = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "emacs-gc-stats";
-        ename = "emacs-gc-stats";
-        version = "1.4.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar";
-          sha256 = "055ma32r92ksjnqy8xbzv0a79r7aap12h61dj860781fapfnifa3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "embark";
-        ename = "embark";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/embark-1.1.tar";
-          sha256 = "074ggh7dkr5jdkwcndl6znhkq48jmc62rp7mc6vjidr6yxf8d1rn";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/embark.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    embark-consult = callPackage ({ compat
-                                  , consult
-                                  , elpaBuild
-                                  , emacs
-                                  , embark
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "embark-consult";
-        ename = "embark-consult";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/embark-consult-1.1.tar";
-          sha256 = "06yh6w4zgvvkfllmcr0szsgjrfhh9rpjwgmcrf6h2gai2ps9xdqr";
-        };
-        packageRequires = [ compat consult emacs embark ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/embark-consult.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ement = callPackage ({ elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib
-                         , map
-                         , persist
-                         , plz
-                         , svg-lib
-                         , taxy
-                         , taxy-magit-section
-                         , transient }:
-      elpaBuild {
-        pname = "ement";
-        ename = "ement";
-        version = "0.15.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ement-0.15.1.tar";
-          sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld";
-        };
-        packageRequires = [
-          emacs
-          map
-          persist
-          plz
-          svg-lib
-          taxy
-          taxy-magit-section
-          transient
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ement.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    emms = callPackage ({ cl-lib ? null
-                        , elpaBuild
-                        , fetchurl
-                        , lib
-                        , nadvice
-                        , seq }:
-      elpaBuild {
-        pname = "emms";
-        ename = "emms";
-        version = "20.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/emms-20.1.tar";
-          sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx";
-        };
-        packageRequires = [ cl-lib nadvice seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/emms.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    engrave-faces = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "engrave-faces";
-        ename = "engrave-faces";
-        version = "0.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar";
-          sha256 = "0nl5wx61192dqd0191dvaszgjc7b2adrxsyc75f529fcyrfwgqfa";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "enwc";
-        ename = "enwc";
-        version = "2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/enwc-2.0.tar";
-          sha256 = "0y8154ykrashgg0bina5ambdrxw2qpimycvjldrk9d67hrccfh3m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/enwc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    epoch-view = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "epoch-view";
-        ename = "epoch-view";
-        version = "0.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el";
-          sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/epoch-view.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "erc";
-        ename = "erc";
-        version = "5.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/erc-5.6.tar";
-          sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/erc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ergoemacs-mode = callPackage ({ cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , undo-tree }:
-      elpaBuild {
-        pname = "ergoemacs-mode";
-        ename = "ergoemacs-mode";
-        version = "5.16.10.12";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.16.10.12.tar";
-          sha256 = "0s4lwb76c67npbcnvbxdawnj02zkc85sbm392lym1qccjmj9d02f";
-        };
-        packageRequires = [ cl-lib emacs undo-tree ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ess = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ess";
-        ename = "ess";
-        version = "24.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ess-24.1.1.tar";
-          sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ess.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    excorporate = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , fsm
-                               , lib
-                               , nadvice
-                               , soap-client
-                               , url-http-ntlm
-                               , url-http-oauth }:
-      elpaBuild {
-        pname = "excorporate";
-        ename = "excorporate";
-        version = "1.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/excorporate-1.1.2.tar";
-          sha256 = "111wvkn0ks7syfgf1cydq5s0kymha0j280xvnp09zcfbj706yhbw";
-        };
-        packageRequires = [
-          cl-lib
-          emacs
-          fsm
-          nadvice
-          soap-client
-          url-http-ntlm
-          url-http-oauth
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/excorporate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    expand-region = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "expand-region";
-        ename = "expand-region";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar";
-          sha256 = "1rjx7w4gss8sbsjaljraa6cjpb57kdpx9zxmr30kbifb5lp511rd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/expand-region.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    expreg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "expreg";
-        ename = "expreg";
-        version = "1.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar";
-          sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/expreg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    external-completion = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "external-completion";
-        ename = "external-completion";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/external-completion-0.1.tar";
-          sha256 = "1bw2kvz7zf1s60d37j31krakryc1kpyial2idjy6ac6w7n1h0jzc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/external-completion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    exwm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, xelb }:
-      elpaBuild {
-        pname = "exwm";
-        ename = "exwm";
-        version = "0.31";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.31.tar";
-          sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq";
-        };
-        packageRequires = [ compat emacs xelb ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/exwm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    f90-interface-browser = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "f90-interface-browser";
-        ename = "f90-interface-browser";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el";
-          sha256 = "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    face-shift = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "face-shift";
-        ename = "face-shift";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/face-shift-0.2.1.tar";
-          sha256 = "14sbafkxr7kmv6sd5rw7d7hcsh0hhx92wkh6arfbchxad8jzimr6";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/face-shift.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    filechooser = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "filechooser";
-        ename = "filechooser";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar";
-          sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/filechooser.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    filladapt = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "filladapt";
-        ename = "filladapt";
-        version = "2.12.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/filladapt-2.12.2.tar";
-          sha256 = "0nmgw6v2krxn5palddqj1jzqxrajhpyq9v2x9lw12cdcldm9ab4k";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/filladapt.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    firefox-javascript-repl = callPackage ({ elpaBuild
-                                           , emacs
-                                           , fetchurl
-                                           , lib }:
-      elpaBuild {
-        pname = "firefox-javascript-repl";
-        ename = "firefox-javascript-repl";
-        version = "0.9.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/firefox-javascript-repl-0.9.5.tar";
-          sha256 = "07qmp6hfzgljrl9gkwy673xk67b3bgxq4kkw2kzr8ma4a7lx7a8l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flylisp = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "flylisp";
-        ename = "flylisp";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/flylisp-0.2.tar";
-          sha256 = "1agny4hc75xc8a9f339bynsazmxw8ccvyb03qx1d6nvwh9d7v1b9";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flylisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "flymake";
-        ename = "flymake";
-        version = "1.3.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar";
-          sha256 = "15ikzdqyh77cgx94jaigfrrzfvwvpca8s2120gi82i9aaiypr7jl";
-        };
-        packageRequires = [ eldoc emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-codespell = callPackage ({ compat
-                                     , elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib }:
-      elpaBuild {
-        pname = "flymake-codespell";
-        ename = "flymake-codespell";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar";
-          sha256 = "1x1bmdjmdaciknd702z54002bi1a5n51vvn9g7j6rnzjc1dxw97f";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-proselint = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "flymake-proselint";
-        ename = "flymake-proselint";
-        version = "0.3.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar";
-          sha256 = "0bq7nc1qiqwxi848xy7wg1ig8k38nmq1w13xws10scjvndlbcjpl";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    fontaine = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "fontaine";
-        ename = "fontaine";
-        version = "2.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar";
-          sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/fontaine.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "frame-tabs";
-        ename = "frame-tabs";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/frame-tabs-1.1.tar";
-          sha256 = "1a7hklir19inai68azgyfiw1bzq5z57kkp33lj6qbxxvfcqvw62w";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    frog-menu = callPackage ({ avy, elpaBuild, emacs, fetchurl, lib, posframe }:
-      elpaBuild {
-        pname = "frog-menu";
-        ename = "frog-menu";
-        version = "0.2.11";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.tar";
-          sha256 = "1iwyg9z8i03p9kkz6vhv00bzsqrsgl4xqqh08icial29c80q939l";
-        };
-        packageRequires = [ avy emacs posframe ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/frog-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "fsm";
-        ename = "fsm";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/fsm-0.2.1.tar";
-          sha256 = "0kvm16077bn6bpbyw3k5935fhiq86ry2j1zcx9sj7dvb9w737qz4";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/fsm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ftable";
-        ename = "ftable";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ftable-1.1.tar";
-          sha256 = "052vqw8892wv8lh5slm90gcvfk7ws5sgl1mzbdi4d3sy4kc4q48h";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ftable.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gcmh";
-        ename = "gcmh";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gcmh-0.2.1.tar";
-          sha256 = "030w493ilmc7w13jizwqsc33a424qjgicy1yxvlmy08yipnw3587";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gcmh.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ggtags";
-        ename = "ggtags";
-        version = "0.9.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar";
-          sha256 = "02gj8ghkk35clyscbvp1p1nlhmgm5h9g2cy4mavnfmx7jikmr4m3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ggtags.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gited";
-        ename = "gited";
-        version = "0.6.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.6.0.tar";
-          sha256 = "1s2h6y1adh28pvm3h5bivfja2nqnzm8w9sfza894pxf96kwk3pg2";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gited.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gle-mode";
-        ename = "gle-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gle-mode-1.1.tar";
-          sha256 = "12vbif4b4j87z7fg18dlcmzmbs2fp1g8bgsk5rch9h6dblg72prq";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gle-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnat-compiler = callPackage ({ elpaBuild, emacs, fetchurl, lib, wisi }:
-      elpaBuild {
-        pname = "gnat-compiler";
-        ename = "gnat-compiler";
-        version = "1.0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar";
-          sha256 = "1chydgswab2m81m3kbd31b1akyw4v1c9468wlfxpg2yydy8fc7vs";
-        };
-        packageRequires = [ emacs wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnome-c-style";
-        ename = "gnome-c-style";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
-          sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnorb";
-        ename = "gnorb";
-        version = "1.6.11";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar";
-          sha256 = "1y0xpbifb8dm8hd5i9g8jph4jm76wviphszl5x3zi6w053jpss9b";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnorb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnu-elpa = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnu-elpa";
-        ename = "gnu-elpa";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar";
-          sha256 = "01cw1r5y86q1aardpvcwvwq161invrzxd0kv4qqi5agaff2nbp26";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnu-elpa.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnu-elpa-keyring-update = callPackage ({ elpaBuild
-                                           , fetchurl
-                                           , lib }:
-      elpaBuild {
-        pname = "gnu-elpa-keyring-update";
-        ename = "gnu-elpa-keyring-update";
-        version = "2022.12.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.1.tar";
-          sha256 = "0yb81ly7y5262fpa0n96yngqmz1rgfwrpm0a6vqghdpr5x0c8z6n";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnugo = callPackage ({ ascii-art-to-unicode
-                         , cl-lib ? null
-                         , elpaBuild
-                         , fetchurl
-                         , lib
-                         , xpm }:
-      elpaBuild {
-        pname = "gnugo";
-        ename = "gnugo";
-        version = "3.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnugo-3.1.2.tar";
-          sha256 = "0wingn5v4wa1xgsgmqqls28cifnff8mvm098kn8clw42mxr40257";
-        };
-        packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnugo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnus-mock = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnus-mock";
-        ename = "gnus-mock";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar";
-          sha256 = "1yl624wzs4kw45zpnxh04dxn1kkpb6c2jl3i0sm1bijyhm303l4h";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gpastel";
-        ename = "gpastel";
-        version = "0.5.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gpastel-0.5.0.tar";
-          sha256 = "12y1ysgnqjvsdp5gal90mp2wplif7rq1cj61393l6gf3pgv6jkzc";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gpastel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gpr-mode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , gnat-compiler
-                            , lib
-                            , wisi }:
-      elpaBuild {
-        pname = "gpr-mode";
-        ename = "gpr-mode";
-        version = "1.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar";
-          sha256 = "1qdk2pkdxggfhj8gm39jb2b29g0gbw50vgil6rv3z0q7nlhpm2fp";
-        };
-        packageRequires = [ emacs gnat-compiler wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gpr-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gpr-query = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , gnat-compiler
-                             , lib
-                             , wisi }:
-      elpaBuild {
-        pname = "gpr-query";
-        ename = "gpr-query";
-        version = "1.0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar";
-          sha256 = "1y283x549w544x37lmh25n19agyah2iz0b052hx8br4rnjdd9ii3";
-        };
-        packageRequires = [ emacs gnat-compiler wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gpr-query.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "graphql";
-        ename = "graphql";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar";
-          sha256 = "1blpsj6sav3z9gj733cccdhpdnyvnvxp48z1hnjh0f0fl5avvkix";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/graphql.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    greader = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "greader";
-        ename = "greader";
-        version = "0.11.13";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/greader-0.11.13.tar";
-          sha256 = "0kyfws0b5dahf96b9wx06hmx0a0qsmywx6bay6xl6a5a4lchszsn";
-        };
-        packageRequires = [ compat emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/greader.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "greenbar";
-        ename = "greenbar";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/greenbar-1.1.tar";
-          sha256 = "14azd170xq602fy4mcc770x5063rvpms8ilbzzn8kwyfvmijlbbx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/greenbar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gtags-mode";
-        ename = "gtags-mode";
-        version = "1.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gtags-mode-1.8.tar";
-          sha256 = "1rd0a3q45b5i46hi8snf25cyv65b7699ghbz8c6hrr4991h3ksll";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    guess-language = callPackage ({ cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , nadvice }:
-      elpaBuild {
-        pname = "guess-language";
-        ename = "guess-language";
-        version = "0.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el";
-          sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz";
-        };
-        packageRequires = [ cl-lib emacs nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/guess-language.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hcel";
-        ename = "hcel";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar";
-          sha256 = "1pm3d0nz2mpf667jkjlmlidh203i4d4gk0n8xd3r66bzwc4l042b";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hcel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    heap = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "heap";
-        ename = "heap";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/heap-0.5.tar";
-          sha256 = "1q42v9mzmlhl4pr3wr94nsis7a9977f35w0qsyx2r982kwgmbndw";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/heap.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hiddenquote = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hiddenquote";
-        ename = "hiddenquote";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar";
-          sha256 = "051aqiq77n487lnsxxwa8q0vyzk6m2fwi3l7xwvrl49p5xpia6zr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    highlight-escape-sequences = callPackage ({ elpaBuild
-                                              , fetchurl
-                                              , lib }:
-      elpaBuild {
-        pname = "highlight-escape-sequences";
-        ename = "highlight-escape-sequences";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.tar";
-          sha256 = "1gs662vvvzrqdlb1z73jf6wykjzs1jskcdksk8akqmply4sjvbpr";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hook-helpers";
-        ename = "hook-helpers";
-        version = "1.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
-          sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    html5-schema = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "html5-schema";
-        ename = "html5-schema";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar";
-          sha256 = "018zvdjhdrkcy8yrsqqqikhl6drmqm1fs0y50m8q8vx42p0cyi1p";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/html5-schema.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, lv }:
-      elpaBuild {
-        pname = "hydra";
-        ename = "hydra";
-        version = "0.15.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar";
-          sha256 = "082wdr2nsfz8jhh7ic4nq4labz0pq8lcdwnxdmw79ppm20p2jipk";
-        };
-        packageRequires = [ cl-lib lv ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hydra.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hyperbole";
-        ename = "hyperbole";
-        version = "9.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar";
-          sha256 = "0gjscqa0zagbymm6wfilvc8g68f8myv90ryd8kqfcpy81fh4dhiz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hyperbole.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    idlwave = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "idlwave";
-        ename = "idlwave";
-        version = "6.5.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/idlwave-6.5.1.tar";
-          sha256 = "0dd0dm92qyin8k4kgavrg82zwjhv6wsjq6gk55rzcspx0s8y2c24";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/idlwave.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ilist = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ilist";
-        ename = "ilist";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ilist-0.3.tar";
-          sha256 = "01a522sqx7j5m6b1k8xn71963igm93cd7ms1aawh1v2wmb09vbhm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ilist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "inspector";
-        ename = "inspector";
-        version = "0.36";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/inspector-0.36.tar";
-          sha256 = "0hbh4a71w4yxicn7v7v492i7iv0ncv5sxwwsbwknbl9ixm482h2z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/inspector.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ioccur";
-        ename = "ioccur";
-        version = "2.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ioccur-2.6.tar";
-          sha256 = "0xyx5xd46n5x078k7pv022h84xmxv7fkh31ddib872bmnirhk6ln";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ioccur.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    isearch-mb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "isearch-mb";
-        ename = "isearch-mb";
-        version = "0.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar";
-          sha256 = "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "iterators";
-        ename = "iterators";
-        version = "0.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/iterators-0.1.1.tar";
-          sha256 = "1xcqvj9dail1irvj2nbfx9x106mcav104pp89jz2diamrky6ja49";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/iterators.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ivy";
-        ename = "ivy";
-        version = "0.14.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar";
-          sha256 = "1h9gfkkcw9nfw85m0mh08qfmi2y0jkvdk54qx0iy5p04ysmhs6k1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-avy = callPackage ({ avy, elpaBuild, emacs, fetchurl, ivy, lib }:
-      elpaBuild {
-        pname = "ivy-avy";
-        ename = "ivy-avy";
-        version = "0.14.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar";
-          sha256 = "12s5z3h8bpa6vdk7f54i2dy18hd3p782pq3x6mkclkvlxijv7d11";
-        };
-        packageRequires = [ avy emacs ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
-      elpaBuild {
-        pname = "ivy-explorer";
-        ename = "ivy-explorer";
-        version = "0.3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.tar";
-          sha256 = "0wv7gp2kznc6f6g9ky1gvq72i78ihp582kyks82h13w25rvh6f0a";
-        };
-        packageRequires = [ emacs ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-hydra = callPackage ({ elpaBuild, emacs, fetchurl, hydra, ivy, lib }:
-      elpaBuild {
-        pname = "ivy-hydra";
-        ename = "ivy-hydra";
-        version = "0.14.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar";
-          sha256 = "1p08rpj3ac2rwjcqbzkq9r5pmc1d9ci7s9bl0qv5cj5r8wpl69mx";
-        };
-        packageRequires = [ emacs hydra ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ivy-posframe = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , ivy
-                                , lib
-                                , posframe }:
-      elpaBuild {
-        pname = "ivy-posframe";
-        ename = "ivy-posframe";
-        version = "0.6.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar";
-          sha256 = "027lbddg4rc44jpvxsqyw9n9pi1bnsssfislg2il3hbr86v88va9";
-        };
-        packageRequires = [ emacs ivy posframe ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jami-bot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "jami-bot";
-        ename = "jami-bot";
-        version = "0.0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar";
-          sha256 = "1dp4k5y7qy793m3fyxvkk57bfy42kac2w5wvy7zqzd4lckm0a93z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jami-bot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jarchive = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "jarchive";
-        ename = "jarchive";
-        version = "0.11.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar";
-          sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jarchive.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "javaimp";
-        ename = "javaimp";
-        version = "0.9.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar";
-          sha256 = "1gy7qys9mzpgbqm5798fncmblmi32b350q51ccsyydq67yh69s3z";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/javaimp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jgraph-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "jgraph-mode";
-        ename = "jgraph-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.tar";
-          sha256 = "1ryxbszp15dy2chch2irqy7rmcspfjw717w4rd0vxjpwvgkjgiql";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jinx = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "jinx";
-        ename = "jinx";
-        version = "1.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jinx-1.9.tar";
-          sha256 = "0k6km295y5w13kl18v9b6y0szdccf89nbar3zkdincy4iid5z6n1";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jinx.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "jit-spell";
-        ename = "jit-spell";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar";
-          sha256 = "0p9nf2n0x6c6xl32aczghzipx8n5aq7a1x6r2s78xvpwr299k998";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jit-spell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "js2-mode";
-        ename = "js2-mode";
-        version = "20231224";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar";
-          sha256 = "023z76zxh5q6g26x7qlgf9476lj95sj84d5s3aqhy6xyskkyyg6c";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/js2-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "json-mode";
-        ename = "json-mode";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/json-mode-0.2.tar";
-          sha256 = "1ix8nq9rjfgbq8vzzjp179j2wa11il0ys8fjjy9gnlqwk6lnk86h";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/json-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jsonrpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "jsonrpc";
-        ename = "jsonrpc";
-        version = "1.0.25";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar";
-          sha256 = "18f0g8j1rd2fpa707w6fll6ryj7mg6hbcy2pc3xff2a4ps8zv12b";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jumpc = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "jumpc";
-        ename = "jumpc";
-        version = "3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jumpc-3.1.tar";
-          sha256 = "1c6wzwrr1ydpn5ah5xnk159xcn4v1gv5rjm4iyfj83dss2ygirzp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jumpc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kind-icon = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg-lib }:
-      elpaBuild {
-        pname = "kind-icon";
-        ename = "kind-icon";
-        version = "0.2.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar";
-          sha256 = "1zafx7rvfyahb7zzl2n9gpb2lc8x3k0bkcap2fl0n54aw4j98i69";
-        };
-        packageRequires = [ emacs svg-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kind-icon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }:
-      elpaBuild {
-        pname = "kiwix";
-        ename = "kiwix";
-        version = "1.1.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar";
-          sha256 = "1krmlyfjs8b7ibixbmv41vhg1gm7prck6lpp61v17fgig92a9k2s";
-        };
-        packageRequires = [ emacs request ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kiwix.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "kmb";
-        ename = "kmb";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/kmb-0.1.tar";
-          sha256 = "12klfmdjjlyjvrzz3rx8dmamnag1fwljhs05jqwd0dv4a2q11gg5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kmb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    landmark = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "landmark";
-        ename = "landmark";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/landmark-1.0.tar";
-          sha256 = "1nnmnvyfjmkk5ddw4q24py1bqzykr29klip61n16bqpr39v56gpg";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/landmark.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    latex-table-wizard = callPackage ({ auctex
-                                      , elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , transient }:
-      elpaBuild {
-        pname = "latex-table-wizard";
-        ename = "latex-table-wizard";
-        version = "1.5.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.4.tar";
-          sha256 = "1999kh5yi0cg1k0al3np3zi2qhrmcpzxqsfvwg0mgrg3mww4gqlw";
-        };
-        packageRequires = [ auctex emacs transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "leaf";
-        ename = "leaf";
-        version = "4.5.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar";
-          sha256 = "1nvpl9ffma0ybbr7vlpcj7q33ja17zrswvl91bqljlmb4lb5121m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/leaf.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lentic = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib, m-buffer }:
-      elpaBuild {
-        pname = "lentic";
-        ename = "lentic";
-        version = "0.12";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lentic-0.12.tar";
-          sha256 = "0pszjhgy9dlk3h5gc8wnlklgl30ha3ig9bpmw2j1ps713vklfms7";
-        };
-        packageRequires = [ dash emacs m-buffer ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lentic.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lentic-server = callPackage ({ elpaBuild
-                                 , fetchurl
-                                 , lentic
-                                 , lib
-                                 , web-server }:
-      elpaBuild {
-        pname = "lentic-server";
-        ename = "lentic-server";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lentic-server-0.2.tar";
-          sha256 = "1r0jcfylvhlihwm6pm4f8pzvsmnlspfkph1hgi5qjkv311045244";
-        };
-        packageRequires = [ lentic web-server ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lentic-server.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "let-alist";
-        ename = "let-alist";
-        version = "1.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/let-alist-1.0.6.tar";
-          sha256 = "1fk1yl2cg4gxcn02n2gki289dgi3lv56n0akkm2h7dhhbgfr6gqm";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/let-alist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lex = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "lex";
-        ename = "lex";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lex-1.2.tar";
-          sha256 = "1pqjrlw558l4z4k40jmli8lmcqlzddhkr0mfm38rbycp7ghdr4zx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lex.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lin = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "lin";
-        ename = "lin";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lin-1.0.0.tar";
-          sha256 = "1yxvpgh3sbw0d0zkjfgbhjc2bziqvkyj7fgwcl3814q7hh8m4146";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lin.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    listen = callPackage ({ elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , persist
-                          , taxy
-                          , taxy-magit-section
-                          , transient }:
-      elpaBuild {
-        pname = "listen";
-        ename = "listen";
-        version = "0.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/listen-0.9.tar";
-          sha256 = "1g1sv8fs8vl93fah7liaqzgwvc4b1chasx5151ayizz4q2qgwwbp";
-        };
-        packageRequires = [ emacs persist taxy taxy-magit-section transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/listen.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    literate-scratch = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "literate-scratch";
-        ename = "literate-scratch";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar";
-          sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
-      elpaBuild {
-        pname = "llm";
-        ename = "llm";
-        version = "0.16.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/llm-0.16.1.tar";
-          sha256 = "1fqn4fdxhazpmlh8pf6ihnh132zjqrixry3kyymsmwang6vh2y7s";
-        };
-        packageRequires = [ emacs plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/llm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lmc = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "lmc";
-        ename = "lmc";
-        version = "1.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lmc-1.4.tar";
-          sha256 = "0c8sd741a7imn1im4j17m99bs6zmppndsxpn23k33lmcqj1rfhsk";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lmc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    load-dir = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "load-dir";
-        ename = "load-dir";
-        version = "0.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/load-dir-0.0.5.tar";
-          sha256 = "1yxnckd7s4alkaddfs672g0jnsxir7c70crnm6rsc5vhmw6310nx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/load-dir.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    load-relative = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "load-relative";
-        ename = "load-relative";
-        version = "1.3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar";
-          sha256 = "04ppqfzlqz7156aqm56yccizv0n71qir7yyp7xfiqq6vgj322rqv";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/load-relative.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    loc-changes = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "loc-changes";
-        ename = "loc-changes";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/loc-changes-1.2.el";
-          sha256 = "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/loc-changes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "loccur";
-        ename = "loccur";
-        version = "1.2.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar";
-          sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/loccur.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "logos";
-        ename = "logos";
-        version = "1.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/logos-1.1.1.tar";
-          sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/logos.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "luwak";
-        ename = "luwak";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar";
-          sha256 = "0z6h1cg7nshv87zl4fia6l5gwf9ax6f4wgxijf2smi8cpwmv6j79";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/luwak.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lv = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "lv";
-        ename = "lv";
-        version = "0.15.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/lv-0.15.0.tar";
-          sha256 = "1wb8whyj8zpsd7nm7r0yjvkfkr2ml80di7alcafpadzli808j2l4";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lv.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    m-buffer = callPackage ({ elpaBuild, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "m-buffer";
-        ename = "m-buffer";
-        version = "0.16";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar";
-          sha256 = "16drbgamp7yd1ndw2qrycrgmnknv5k7h4d7svcdhv9az6fg1vzn4";
-        };
-        packageRequires = [ seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/m-buffer.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "map";
-        ename = "map";
-        version = "3.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/map-3.3.1.tar";
-          sha256 = "1za8wjdvyxsxvmzla823f7z0s4wbl22l8k08v8b4h4m6i7w356lp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/map.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    marginalia = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "marginalia";
-        ename = "marginalia";
-        version = "1.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/marginalia-1.6.tar";
-          sha256 = "0an3ayka1f7n511bjfwz42h9g5b1vhb6x47jy0k9psscr7pbhszg";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/marginalia.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    markchars = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "markchars";
-        ename = "markchars";
-        version = "0.2.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/markchars-0.2.2.tar";
-          sha256 = "0jagp5s2kk8ijwxbg5ccq31bjlcxkqpqhsg7a1hbyp3p5z3j73m0";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/markchars.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "math-symbol-lists";
-        ename = "math-symbol-lists";
-        version = "1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar";
-          sha256 = "1r2acaf79kwwvndqn9xbvq9dc12vr3lryc25yp0w0gksp86p8cfa";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mct = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mct";
-        ename = "mct";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mct-1.0.0.tar";
-          sha256 = "0f8znz4basrdh56pcldsazxv3mwqir807lsaza2g5bfqws0c7h8k";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mct.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    memory-usage = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "memory-usage";
-        ename = "memory-usage";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/memory-usage-0.2.tar";
-          sha256 = "04bylvy86x8w96g7zil3jzyac0fijvb5lz4830ja5yabpvsnk3vq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/memory-usage.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "metar";
-        ename = "metar";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/metar-0.3.tar";
-          sha256 = "07nf14zm5y6ma6wqnyw5bf7cvk3ybw7hvlrwcnri10s8vh3rqd0r";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/metar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "midi-kbd";
-        ename = "midi-kbd";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/midi-kbd-0.2.tar";
-          sha256 = "0jd92rainjd1nx72z7mrvsxs3az6axxiw1v9sbpsj03x8qq0129q";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mines";
-        ename = "mines";
-        version = "1.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mines-1.6.tar";
-          sha256 = "0j52n43mv963hpgdh5kk1k9wi821r6w3diwdp47rfwsijdd0wnhs";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mines.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minibuffer-header = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "minibuffer-header";
-        ename = "minibuffer-header";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar";
-          sha256 = "1qic33wsdba5xw3qxigq18nibwhj45ggk0ragy4zj9cfy1l2ni44";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "minibuffer-line";
-        ename = "minibuffer-line";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.tar";
-          sha256 = "0sg9vhv7bi82a90ziiwsabnfvw8zp544v0l93hbl42cj432bpwfx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minimap = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "minimap";
-        ename = "minimap";
-        version = "1.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/minimap-1.4.tar";
-          sha256 = "0n27wp65x5n21qy6x5dhzms8inf0248kzninp56kfx1bbf9w4x66";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minimap.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mmm-mode";
-        ename = "mmm-mode";
-        version = "0.5.11";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar";
-          sha256 = "0dh76lk0am07j2zi7hhbmr6cnnss7l0b9rhi9is0w0n5i7j4i0p2";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "modus-themes";
-        ename = "modus-themes";
-        version = "4.4.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar";
-          sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/modus-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "mpdired";
-        ename = "mpdired";
-        version = "2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mpdired-2.tar";
-          sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mpdired.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    multi-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "multi-mode";
-        ename = "multi-mode";
-        version = "1.14";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/multi-mode-1.14.tar";
-          sha256 = "0i2l50lcsj3mm9k38kfmh2hnb437pjbk2yxv26p6na1g1n44lkil";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/multi-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "multishell";
-        ename = "multishell";
-        version = "1.1.10";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar";
-          sha256 = "1khqc7a04ynl63lpv898361sv37jgpd1fzvl0ryphprv9shnhw10";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/multishell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    muse = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "muse";
-        ename = "muse";
-        version = "3.20.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/muse-3.20.2.tar";
-          sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/muse.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "myers";
-        ename = "myers";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/myers-0.1.tar";
-          sha256 = "0a053w7nj0qfryvsh1ss854wxwbk5mhkl8a5nprcfgsh4qh2m487";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/myers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nadvice = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "nadvice";
-        ename = "nadvice";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nadvice-0.4.tar";
-          sha256 = "19dx07v4z2lyyp18v45c5hgp65akw58bdqg5lcrzyb9mrlji8js6";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nadvice.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "nameless";
-        ename = "nameless";
-        version = "1.0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nameless-1.0.2.tar";
-          sha256 = "0m3z701j2i13zmr4g0wjd3ms6ajr6w371n5kx95n9ssxyjwjppcm";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nameless.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "names";
-        ename = "names";
-        version = "20151201.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/names-20151201.0.tar";
-          sha256 = "0nf6n8hk58a7r56d899s5dsva3jjvh3qx9g2d1hra403fwlds74k";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/names.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nano-agenda = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "nano-agenda";
-        ename = "nano-agenda";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar";
-          sha256 = "12sh6wqqd13sv966wj4k4djidn238fdb6l4wg3z9ib0dx36nygcr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "nano-modeline";
-        ename = "nano-modeline";
-        version = "1.1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar";
-          sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nano-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "nano-theme";
-        ename = "nano-theme";
-        version = "0.3.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar";
-          sha256 = "0x49lk0kx8mz72a81li6gwg3kivn7bn4ld0mml28smzqqfr3873a";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nano-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nftables-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "nftables-mode";
-        ename = "nftables-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar";
-          sha256 = "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nhexl-mode = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib }:
-      elpaBuild {
-        pname = "nhexl-mode";
-        ename = "nhexl-mode";
-        version = "1.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.tar";
-          sha256 = "1i1by5bp5dby2r2jhzr0jvnchrybgnzmc5ln84w66180shk2s3yk";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nlinum = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "nlinum";
-        ename = "nlinum";
-        version = "1.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nlinum-1.9.tar";
-          sha256 = "1cpyg6cxaaaaq6hc066l759dlas5mhn1fi398myfglnwrglia3lm";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nlinum.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    notes-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "notes-mode";
-        ename = "notes-mode";
-        version = "1.31";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/notes-mode-1.31.tar";
-          sha256 = "0lwja53cknd1w432mcbfrcshmxmk23dqrbr9k2101pqfzbw8nri2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/notes-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    notmuch-indicator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "notmuch-indicator";
-        ename = "notmuch-indicator";
-        version = "1.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar";
-          sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ntlm = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ntlm";
-        ename = "ntlm";
-        version = "2.1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ntlm-2.1.0.tar";
-          sha256 = "0kivmb6b57qjrwd41zwlfdq7l9nisbh4mgd96rplrkxpzw6dq0j7";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ntlm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    num3-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "num3-mode";
-        ename = "num3-mode";
-        version = "1.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar";
-          sha256 = "1a7w2qd210zp199c1js639xbv2kmqmgvcqi5dn1vsazasp2dwlj2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/num3-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "oauth2";
-        ename = "oauth2";
-        version = "0.16";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/oauth2-0.16.tar";
-          sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311";
-        };
-        packageRequires = [ cl-lib nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/oauth2.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ob-asymptote = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ob-asymptote";
-        ename = "ob-asymptote";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar";
-          sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ob-asymptote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ob-haxe";
-        ename = "ob-haxe";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar";
-          sha256 = "095qcvxpanw6fh96dfkdydn10xikbrjwih7i05iiyvazpk4x6nbz";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "objed";
-        ename = "objed";
-        version = "0.8.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/objed-0.8.3.tar";
-          sha256 = "1shgpha6f1pql95v86whsw6w6j7v35cas98fyygwrpkcrxx9a56r";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/objed.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    omn-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "omn-mode";
-        ename = "omn-mode";
-        version = "1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/omn-mode-1.3.tar";
-          sha256 = "01yg4ifbz7jfhvq6r6naf50vx00wpjsr44mmlj580bylfrmdc839";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/omn-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    on-screen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "on-screen";
-        ename = "on-screen";
-        version = "1.3.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/on-screen-1.3.3.tar";
-          sha256 = "0w5cv3bhb6cyjhvglp5y6cy51ppsh2xd1x53i4w0gm44g5n8l6bd";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/on-screen.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    openpgp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "openpgp";
-        ename = "openpgp";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/openpgp-1.0.1.tar";
-          sha256 = "052wh38q6r09avxa0bgc5gn4769763zmgijza76mb0b3lzj66syv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/openpgp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "orderless";
-        ename = "orderless";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/orderless-1.1.tar";
-          sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/orderless.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org";
-        ename = "org";
-        version = "9.7.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.7.6.tar";
-          sha256 = "0pxjc2bydnzd31wg71nfh7zzf3mhsnzm2nd7p736bj1w0pvg89ng";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-contacts = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-contacts";
-        ename = "org-contacts";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar";
-          sha256 = "0gqanhnrxajx5cf7g9waks23sclbmvmwjqrs0q4frcih3gs2nhix";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-contacts.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }:
-      elpaBuild {
-        pname = "org-edna";
-        ename = "org-edna";
-        version = "1.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar";
-          sha256 = "1pifs5mbcjab21ylclck4kjdcds1xkvym27ncn9wwr8fl3fff2yl";
-        };
-        packageRequires = [ emacs org seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-edna.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-jami-bot = callPackage ({ elpaBuild, emacs, fetchurl, jami-bot, lib }:
-      elpaBuild {
-        pname = "org-jami-bot";
-        ename = "org-jami-bot";
-        version = "0.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar";
-          sha256 = "1fiv0a7k6alvfvb7c6av0kbkwbw58plw05hhcf1vnkr9gda3s13y";
-        };
-        packageRequires = [ emacs jami-bot ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-modern = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org-modern";
-        ename = "org-modern";
-        version = "1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-modern-1.3.tar";
-          sha256 = "1lpl9q9ijyp6pwb0qap9ydzkq0pd5xkbfpaqy1nvcy5b906jmkdj";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-modern.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-notify = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org-notify";
-        ename = "org-notify";
-        version = "0.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar";
-          sha256 = "1vg0h32x5lc3p5n71m23q8mfdd1fq9ffmy9rsm5rcdphfk8s9x5l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-notify.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-real";
-        ename = "org-real";
-        version = "1.0.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar";
-          sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2";
-        };
-        packageRequires = [ boxy emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-real.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-remark = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-remark";
-        ename = "org-remark";
-        version = "1.2.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar";
-          sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-remark.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-transclusion = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-transclusion";
-        ename = "org-transclusion";
-        version = "1.4.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar";
-          sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-translate = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-translate";
-        ename = "org-translate";
-        version = "0.1.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar";
-          sha256 = "0s0vqpncb6rvhpxdir5ghanjyhpw7bplqfh3bpgri5ay2b46kj4f";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-translate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "orgalist";
-        ename = "orgalist";
-        version = "1.16";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/orgalist-1.16.tar";
-          sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/orgalist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    osc = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "osc";
-        ename = "osc";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/osc-0.4.tar";
-          sha256 = "1ls6v0mkh7z90amrlczrvv6mgpv6hzzjw0zlxjlzsj2vr1gz3vca";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/osc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "osm";
-        ename = "osm";
-        version = "1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/osm-1.3.tar";
-          sha256 = "0s5k6akdvbm9gsgzjlz795vgfy3pkl4qdk45p16p40f59dr49g4r";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/osm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "other-frame-window";
-        ename = "other-frame-window";
-        version = "1.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.tar";
-          sha256 = "1x8i6hbl48vmp5h43drr35lwaiwhcyr3vnk7rcyim5jl2ijw8yc0";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pabbrev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pabbrev";
-        ename = "pabbrev";
-        version = "4.3.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar";
-          sha256 = "1fplbmzqz066gsmvmf2indg4n348vdgs2m34dm32gnrjghfrxxhs";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pabbrev.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "paced";
-        ename = "paced";
-        version = "1.1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
-          sha256 = "0j2362zq22j6qma6bb6jh6qpd12zrc161pgl9cfhnq5m3s9i1sz4";
-        };
-        packageRequires = [ async emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/paced.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "parsec";
-        ename = "parsec";
-        version = "0.1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar";
-          sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/parsec.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    parser-generator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "parser-generator";
-        ename = "parser-generator";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar";
-          sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/parser-generator.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "path-iterator";
-        ename = "path-iterator";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar";
-          sha256 = "0v9gasc0wlqd7pks6k3695md7mdfnaknh6xinmp4pkvvalfh7shv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/path-iterator.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "peg";
-        ename = "peg";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/peg-1.0.1.tar";
-          sha256 = "14ll56fn9n11nydydslp7xyn79122dprm89i181ks170v0qcsps3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/peg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "perl-doc";
-        ename = "perl-doc";
-        version = "0.81";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar";
-          sha256 = "1828jfl5dwk1751jsrpr2gr8hs1x315xlb9vhiis8frzvqmsribw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/perl-doc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    persist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "persist";
-        ename = "persist";
-        version = "0.6.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/persist-0.6.1.tar";
-          sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/persist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    phps-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "phps-mode";
-        ename = "phps-mode";
-        version = "0.4.49";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.4.49.tar";
-          sha256 = "1zxzv6h2075s0ldwr9izfy3sxrrg3x5y5vilnlgnwd7prcq8qa8y";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/phps-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pinentry = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "pinentry";
-        ename = "pinentry";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pinentry-0.1.tar";
-          sha256 = "0i5g4yj2qva3rp8ay2fl9gcmp7q42caqryjyni8r5h4f3misviwq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pinentry.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "plz";
-        ename = "plz";
-        version = "0.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/plz-0.9.tar";
-          sha256 = "1wgcfwrmbw6bl00midhn99hn3fvbavkibb4r6s99yzmd48vyapr8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/plz.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
-      elpaBuild {
-        pname = "plz-see";
-        ename = "plz-see";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/plz-see-0.1.tar";
-          sha256 = "1mi35d9b26d425v1kkmmbh477klcxf76fnyg154ddjm0nkgqq90d";
-        };
-        packageRequires = [ emacs plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/plz-see.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "poke";
-        ename = "poke";
-        version = "3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/poke-3.2.tar";
-          sha256 = "15j4g5y427d9mja2irv3ak6x60ik4kpnscnwl9pqym7qly7sa3v9";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/poke.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    poke-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "poke-mode";
-        ename = "poke-mode";
-        version = "3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar";
-          sha256 = "0g4vd26ahkmjxlcvqwd0mbk60qaf6c9zba9x7bb9pqabka9438y1";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/poke-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    poker = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "poker";
-        ename = "poker";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/poker-0.2.tar";
-          sha256 = "10lfc6i4f08ydxanidwiq9404h4nxfa0vh4av5rrj6snqzqvd1bw";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/poker.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    popper = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "popper";
-        ename = "popper";
-        version = "0.4.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/popper-0.4.6.tar";
-          sha256 = "0xwy4p9g0lfd4ybamsl5gsppmx79yv16s4lh095x5y5qfmgcvq2c";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/popper.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "posframe";
-        ename = "posframe";
-        version = "1.4.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar";
-          sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/posframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pq = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pq";
-        ename = "pq";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pq-0.2.tar";
-          sha256 = "0d8ylsbmypaj29w674a4k445zr6hnggic8rsv7wx7jml6p2zph2n";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pq.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    preview-auto = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "preview-auto";
-        ename = "preview-auto";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar";
-          sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/preview-auto.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    preview-tailor = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "preview-tailor";
-        ename = "preview-tailor";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/preview-tailor-0.2.tar";
-          sha256 = "1mqh2myz5w84f4n01ibd695h4mnqwjxmg7rvs7pz3sylz1xqyks7";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
-      elpaBuild {
-        pname = "project";
-        ename = "project";
-        version = "0.11.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/project-0.11.1.tar";
-          sha256 = "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0";
-        };
-        packageRequires = [ emacs xref ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/project.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    psgml = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "psgml";
-        ename = "psgml";
-        version = "1.3.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar";
-          sha256 = "1lfk95kr43az6ykfyhj7ygccw3ms2ifyyp43w9lwm5fcawgc8952";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/psgml.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "pspp-mode";
-        ename = "pspp-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el";
-          sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pulsar";
-        ename = "pulsar";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar";
-          sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pulsar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }:
-      elpaBuild {
-        pname = "pyim";
-        ename = "pyim";
-        version = "5.3.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pyim-5.3.4.tar";
-          sha256 = "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs";
-        };
-        packageRequires = [ async emacs xr ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pyim.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pyim-basedict = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "pyim-basedict";
-        ename = "pyim-basedict";
-        version = "0.5.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar";
-          sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "python";
-        ename = "python";
-        version = "0.28";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/python-0.28.tar";
-          sha256 = "042jhg87bnc750wwjwvp32ici3pyswx1pza2qz014ykdqqnsx0aq";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/python.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "quarter-plane";
-        ename = "quarter-plane";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/quarter-plane-0.1.tar";
-          sha256 = "06syayqdmh4nb7ys52g1mw01wnz5hjv710dari106fk8fm9cy18c";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    queue = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "queue";
-        ename = "queue";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/queue-0.2.tar";
-          sha256 = "117g6sl5dh7ssp6m18npvrqik5rs2mnr16129cfpnbi3crsw23c8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/queue.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rainbow-mode";
-        ename = "rainbow-mode";
-        version = "1.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar";
-          sha256 = "0xv39jix1gbwq6f8laj93sqkf2j5hwda3l7mjqc7vsqjw1lkhmjv";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rbit = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rbit";
-        ename = "rbit";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rbit-0.1.tar";
-          sha256 = "1xfl3m53bdi25h8mp7s0zp1yy7436cfydxrgkfc31fsxkh009l9h";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rbit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rcirc-color = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "rcirc-color";
-        ename = "rcirc-color";
-        version = "0.4.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar";
-          sha256 = "0sfwmi0sspj7sx1psij4fzq1knwva8706w0204mbjxsq2nh5s9f3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rcirc-menu";
-        ename = "rcirc-menu";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el";
-          sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rcirc-sqlite = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "rcirc-sqlite";
-        ename = "rcirc-sqlite";
-        version = "1.0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar";
-          sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , load-relative
-                           , loc-changes
-                           , test-simple }:
-      elpaBuild {
-        pname = "realgud";
-        ename = "realgud";
-        version = "1.5.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar";
-          sha256 = "1iisvzxvdsifxkz7b2wacw85dkjagrmbcdhcfsnswnfbp3r3kg35";
-        };
-        packageRequires = [ emacs load-relative loc-changes test-simple ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-ipdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, realgud }:
-      elpaBuild {
-        pname = "realgud-ipdb";
-        ename = "realgud-ipdb";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar";
-          sha256 = "0zmgsrb15rmgszidx4arjazb6fz523q5w516z5k5cn92wfzfyncr";
-        };
-        packageRequires = [ emacs realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-jdb = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib
-                               , load-relative
-                               , realgud }:
-      elpaBuild {
-        pname = "realgud-jdb";
-        ename = "realgud-jdb";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar";
-          sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc";
-        };
-        packageRequires = [ cl-lib emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-lldb = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib
-                                , load-relative
-                                , realgud }:
-      elpaBuild {
-        pname = "realgud-lldb";
-        ename = "realgud-lldb";
-        version = "1.0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar";
-          sha256 = "1g4spjrldyi9rrh5dwrcqpz5qm37fq2qpvmirxvdqgfbwl6gapzj";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-node-debug = callPackage ({ cl-lib ? null
-                                      , elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , load-relative
-                                      , realgud }:
-      elpaBuild {
-        pname = "realgud-node-debug";
-        ename = "realgud-node-debug";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar";
-          sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir";
-        };
-        packageRequires = [ cl-lib emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-node-inspect = callPackage ({ cl-lib ? null
-                                        , elpaBuild
-                                        , emacs
-                                        , fetchurl
-                                        , lib
-                                        , load-relative
-                                        , realgud }:
-      elpaBuild {
-        pname = "realgud-node-inspect";
-        ename = "realgud-node-inspect";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar";
-          sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2";
-        };
-        packageRequires = [ cl-lib emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-trepan-ni = callPackage ({ cl-lib ? null
-                                     , elpaBuild
-                                     , emacs
-                                     , fetchurl
-                                     , lib
-                                     , load-relative
-                                     , realgud }:
-      elpaBuild {
-        pname = "realgud-trepan-ni";
-        ename = "realgud-trepan-ni";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar";
-          sha256 = "09vllklpfc0q28ankp2s1v10kwnxab4g6hb9zn63d1rfa92qy44k";
-        };
-        packageRequires = [ cl-lib emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    realgud-trepan-xpy = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , load-relative
-                                      , realgud }:
-      elpaBuild {
-        pname = "realgud-trepan-xpy";
-        ename = "realgud-trepan-xpy";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-trepan-xpy-1.0.1.tar";
-          sha256 = "13fll0c6p2idg56q0czgv6s00vvb585b40dn3b14hdpy0givrc0x";
-        };
-        packageRequires = [ emacs load-relative realgud ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rec-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "rec-mode";
-        ename = "rec-mode";
-        version = "1.9.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar";
-          sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rec-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    register-list = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "register-list";
-        ename = "register-list";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/register-list-0.1.tar";
-          sha256 = "01w2yyvbmnkjrmx5f0dk0327c0k7fvmgi928j6hbvlrp5wk6s394";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/register-list.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }:
-      elpaBuild {
-        pname = "relint";
-        ename = "relint";
-        version = "1.24";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/relint-1.24.tar";
-          sha256 = "0pnv2pkx5jq30049zplrmspkm1cc7p6vy9xfv215d27v8nas0374";
-        };
-        packageRequires = [ emacs xr ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/relint.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    repology = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "repology";
-        ename = "repology";
-        version = "1.2.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/repology-1.2.4.tar";
-          sha256 = "0nj4dih9mv8crqq8rd4k8dzgq7l0195syfxsf2gyikmqz9sjbr85";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/repology.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rich-minority";
-        ename = "rich-minority";
-        version = "1.0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar";
-          sha256 = "0npk6gnr2m4mfv40y2m265lxk1dyn8fd6d90vs3j2xrhpybgbln2";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rich-minority.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rnc-mode";
-        ename = "rnc-mode";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar";
-          sha256 = "1p03g451888v86k9z6g8gj375p1pcdvikgk1phxkhipwi5hbf5g8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rt-liberation";
-        ename = "rt-liberation";
-        version = "7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rt-liberation-7.tar";
-          sha256 = "0bi1qyc4n4ar0rblnddmlrlrkdvdrvv54wg4ii39hhxij4p6niif";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ruby-end = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ruby-end";
-        ename = "ruby-end";
-        version = "0.4.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar";
-          sha256 = "07175v9fy96lmkfa0007lhx7v3fkk77iwca3rjl94dgdp4b8lbk5";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ruby-end.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rudel = callPackage ({ cl-generic
-                         , cl-lib ? null
-                         , cl-print ? null
-                         , elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib }:
-      elpaBuild {
-        pname = "rudel";
-        ename = "rudel";
-        version = "0.3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar";
-          sha256 = "00rs2fy64ybam26szpc93miwajq42acyh0dkg0ixr95mg49sc46j";
-        };
-        packageRequires = [ cl-generic cl-lib cl-print emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rudel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "satchel";
-        ename = "satchel";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/satchel-0.2.tar";
-          sha256 = "115rkq2ygawsg8ph44zfqwsd9ykm4370v0whgjwhc1wx2iyn5ir9";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/satchel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "scanner";
-        ename = "scanner";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/scanner-0.2.tar";
-          sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scanner.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "scroll-restore";
-        ename = "scroll-restore";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/scroll-restore-1.0.tar";
-          sha256 = "1i9ld1l5h2cpzf8bzk7nlk2bcln48gya8zrq79v6rawbrwdlz2z4";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sed-mode";
-        ename = "sed-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar";
-          sha256 = "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sed-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    seq = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "seq";
-        ename = "seq";
-        version = "2.24";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/seq-2.24.tar";
-          sha256 = "13x8l1m5if6jpc8sbrbx9r64fyhh450ml6vfm92p6i5wv6gl74w6";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/seq.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "setup";
-        ename = "setup";
-        version = "1.4.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/setup-1.4.0.tar";
-          sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/setup.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shelisp = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "shelisp";
-        ename = "shelisp";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar";
-          sha256 = "0zhkk04nj25lmpdlqblfhx3rb415w2f58f7wb19k1s2ry4k7m15g";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shelisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "shell-command-plus";
-        ename = "shell-command+";
-        version = "2.4.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
-          sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shell-command+.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "shen-mode";
-        ename = "shen-mode";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar";
-          sha256 = "0xskyd0d3krwgrpca10m7l7c0l60qq7jjn2q207n61yw5yx71pqn";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shen-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sisu-mode";
-        ename = "sisu-mode";
-        version = "7.1.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.tar";
-          sha256 = "02cfyrjynwvf2rlnkfy8285ga9kzbg1b614sch0xnxqw81mp7drp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    site-lisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "site-lisp";
-        ename = "site-lisp";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar";
-          sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/site-lisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sketch-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sketch-mode";
-        ename = "sketch-mode";
-        version = "1.0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar";
-          sha256 = "1vrbmyhf9bffy2fkz91apzxla6v8nbv2wb25vxcr9x3smbag9kal";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    slime-volleyball = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "slime-volleyball";
-        ename = "slime-volleyball";
-        version = "1.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar";
-          sha256 = "1qlmsxnhja8p873rvb1qj4xsf938bs3hl8qqqsmrm0csvlb9737p";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sm-c-mode";
-        ename = "sm-c-mode";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sm-c-mode-1.2.tar";
-          sha256 = "0xykl8wkbw5y7ah79zlfzz1k0di9ghfsv2xjxwx7rrb37wny5184";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "smalltalk-mode";
-        ename = "smalltalk-mode";
-        version = "4.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar";
-          sha256 = "0ly2qmsbmzd5nd7iaighws10y0yj7p2356fw32pkp0cmzzvc3d54";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "smart-yank";
-        ename = "smart-yank";
-        version = "0.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.tar";
-          sha256 = "08dc4c60jcjyiixyzckxk5qk6s2pl1jmrp4h1bj53ssd1kn4208m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/smart-yank.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sml-mode";
-        ename = "sml-mode";
-        version = "6.12";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar";
-          sha256 = "10zp0gi5rbjjxjzn9k6klvdms9k3yxx0qry0wa75a68sj5x2rdzh";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sml-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "so-long";
-        ename = "so-long";
-        version = "1.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar";
-          sha256 = "01qdxlsllpj5ajixkqf7v9p95zn9qnvjdnp30v54ymj2pd0d9a32";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/so-long.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    soap-client = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "soap-client";
-        ename = "soap-client";
-        version = "3.2.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/soap-client-3.2.3.tar";
-          sha256 = "1yhs661g0vqxpxqcxgsxvljmrpcqzl0y52lz6jvfilmshw7r6k2s";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/soap-client.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sokoban = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sokoban";
-        ename = "sokoban";
-        version = "1.4.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar";
-          sha256 = "1l3d4al96252kdhyn4dr88ir67kay57n985w0qy8p930ncrs846v";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sokoban.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sotlisp";
-        ename = "sotlisp";
-        version = "1.6.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.tar";
-          sha256 = "0q65iwr89cwwqnc1kndf2agq5wp48a7k02qsksgaj0n6zv7i4dfn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sotlisp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    spacious-padding = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "spacious-padding";
-        ename = "spacious-padding";
-        version = "0.5.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar";
-          sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "spinner";
-        ename = "spinner";
-        version = "1.7.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar";
-          sha256 = "0lq8q62q5an8199p8pyafg5l6hdnnqi6i6sybnk60sdcqy62pa6r";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/spinner.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sql-beeline";
-        ename = "sql-beeline";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar";
-          sha256 = "0ngvvfhs1fj3ca5g563bssaz9ac5fiqkqzv09s4ramalp2q6axq9";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-cassandra = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sql-cassandra";
-        ename = "sql-cassandra";
-        version = "0.2.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar";
-          sha256 = "154rymq0k6869cw7sc7nhx3di5qv1ffgf8shkxc22gvkrj2s7p9b";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "sql-indent";
-        ename = "sql-indent";
-        version = "1.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar";
-          sha256 = "1yfb01wh5drgvrwbn0hgzyi0rc4zlr1w23d065x4qrld31jbka8i";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sql-indent.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz, transient }:
-      elpaBuild {
-        pname = "srht";
-        ename = "srht";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/srht-0.4.tar";
-          sha256 = "0ps49syzlaf4lxvji61y6y7r383r65v96d57hj75xkn6hvyrz74n";
-        };
-        packageRequires = [ emacs plz transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/srht.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ssh-deploy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ssh-deploy";
-        ename = "ssh-deploy";
-        version = "3.1.16";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar";
-          sha256 = "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    standard-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "standard-themes";
-        ename = "standard-themes";
-        version = "2.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/standard-themes-2.0.1.tar";
-          sha256 = "0cyr3n9w359sa8ylcgzsvhxrk9f1rl1scb5339ci2la7zpg5vxwr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/standard-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "stream";
-        ename = "stream";
-        version = "2.3.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.3.0.tar";
-          sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/stream.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    substitute = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "substitute";
-        ename = "substitute";
-        version = "0.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar";
-          sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/substitute.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "svg";
-        ename = "svg";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/svg-1.1.tar";
-          sha256 = "10x2rry349ibzd9awy4rg18cd376yvkzqsyq0fm4i05kq4dzqp4a";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
-      elpaBuild {
-        pname = "svg-clock";
-        ename = "svg-clock";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/svg-clock-1.2.tar";
-          sha256 = "0r0wayb1q0dd2yi1nqa0m4jfy36lydxxa6xvvd6amgh9sy499qs8";
-        };
-        packageRequires = [ emacs svg ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg-clock.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "svg-lib";
-        ename = "svg-lib";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar";
-          sha256 = "1s7n3j1yzprs9frb554c66pcrv3zss1y26y6qgndii4bbzpa7jh8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg-lib.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    svg-tag-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg-lib }:
-      elpaBuild {
-        pname = "svg-tag-mode";
-        ename = "svg-tag-mode";
-        version = "0.3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar";
-          sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr";
-        };
-        packageRequires = [ emacs svg-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
-      elpaBuild {
-        pname = "swiper";
-        ename = "swiper";
-        version = "0.14.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar";
-          sha256 = "1rzp78ix19ddm7fx7p4i5iybd5lw244kqvf3nrafz3r7q6hi8yds";
-        };
-        packageRequires = [ emacs ivy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/swiper.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    switchy-window = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "switchy-window";
-        ename = "switchy-window";
-        version = "1.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar";
-          sha256 = "0ym5cy6czsrd15f8rgh3dad8fwn8pb2xrvhlmdikc59cc29zamrv";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/switchy-window.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sxhkdrc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sxhkdrc-mode";
-        ename = "sxhkdrc-mode";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar";
-          sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "system-packages";
-        ename = "system-packages";
-        version = "1.0.13";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar";
-          sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/system-packages.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }:
-      elpaBuild {
-        pname = "tNFA";
-        ename = "tNFA";
-        version = "0.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el";
-          sha256 = "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds";
-        };
-        packageRequires = [ queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tNFA.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tam = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }:
-      elpaBuild {
-        pname = "tam";
-        ename = "tam";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tam-0.1.tar";
-          sha256 = "16ms55cwm2cwixl03a3bbsqs159c3r3dv5kaazvsghby6c511bx8";
-        };
-        packageRequires = [ emacs queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tam.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "taxy";
-        ename = "taxy";
-        version = "0.10.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar";
-          sha256 = "0r4kv0lqjk720p8kfah256370miqg68598jp5466sc6v9qax4wd9";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/taxy.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    taxy-magit-section = callPackage ({ elpaBuild
-                                      , emacs
-                                      , fetchurl
-                                      , lib
-                                      , magit-section
-                                      , taxy }:
-      elpaBuild {
-        pname = "taxy-magit-section";
-        ename = "taxy-magit-section";
-        version = "0.13";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/taxy-magit-section-0.13.tar";
-          sha256 = "06sivl4rc06qr67qw2gqpw7lsaqf3j78llkrljwby7a77yzlhbrj";
-        };
-        packageRequires = [ emacs magit-section taxy ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "temp-buffer-browse";
-        ename = "temp-buffer-browse";
-        version = "1.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.tar";
-          sha256 = "00hbh25fj5fm9dsp8fpdk8lap3gi5jlva6f0m6kvjqnmvc06q36r";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tempel";
-        ename = "tempel";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tempel-1.1.tar";
-          sha256 = "01zrp3wi4nvp67wda1b5fyjfxd0akhk7aqc2nqh1sk4mjp5zpnsq";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tempel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "test-simple";
-        ename = "test-simple";
-        version = "1.3.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/test-simple-1.3.0.tar";
-          sha256 = "065jfps5ixpy5d4l2xgwhkpafdwiziqh4msbjcascwpac3j5c5yp";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/test-simple.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tex-item = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tex-item";
-        ename = "tex-item";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tex-item-0.1.tar";
-          sha256 = "0ggbn3lk64cv6pnw97ww7vn250jchj80zx3hvkcqlccyw34x6ziy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tex-item.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tex-parens = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tex-parens";
-        ename = "tex-parens";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar";
-          sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd";
-        };
-        packageRequires = [ auctex emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tex-parens.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    theme-buffet = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "theme-buffet";
-        ename = "theme-buffet";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar";
-          sha256 = "1cfrrl41rlxdbybvxs8glkgmgkznwgpq70h58rkvwm6b5jfs8wv0";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/theme-buffet.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    timerfunctions = callPackage ({ cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib }:
-      elpaBuild {
-        pname = "timerfunctions";
-        ename = "timerfunctions";
-        version = "1.4.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
-          sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tiny = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "tiny";
-        ename = "tiny";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar";
-          sha256 = "1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tiny.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tmr = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tmr";
-        ename = "tmr";
-        version = "0.4.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar";
-          sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tmr.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }:
-      elpaBuild {
-        pname = "tomelr";
-        ename = "tomelr";
-        version = "0.4.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar";
-          sha256 = "0r2f4dl10fl75ygvbmb4vkqixy24k0z2wpr431ljzp5m29bn74kh";
-        };
-        packageRequires = [ emacs map seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tomelr.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    topspace = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "topspace";
-        ename = "topspace";
-        version = "0.3.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar";
-          sha256 = "0m8z2q1gdi0zfh1df5xb2v0sg1v5fysrl00fv2qqgnd61c2n0hhz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/topspace.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    track-changes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "track-changes";
-        ename = "track-changes";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/track-changes-1.2.tar";
-          sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/track-changes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tramp";
-        ename = "tramp";
-        version = "2.7.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.7.1.tar";
-          sha256 = "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tramp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tramp-nspawn = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tramp-nspawn";
-        ename = "tramp-nspawn";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar";
-          sha256 = "0cy8l389s6pi135gxcygv1vna6k3gizqd33avf3wsdbnqdf2pjnc";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tramp-theme";
-        ename = "tramp-theme";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar";
-          sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    transcribe = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "transcribe";
-        ename = "transcribe";
-        version = "1.5.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transcribe-1.5.2.tar";
-          sha256 = "1v1bvcv3zqrj073l3vw7gz20rpa9p86rf1yv219n47kmh27c80hq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/transcribe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    transient = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "transient";
-        ename = "transient";
-        version = "0.7.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transient-0.7.2.tar";
-          sha256 = "0i68wpwxf729qxjxhafkp098wcmkqn06ka3hcqnlky2p1zl29hby";
-        };
-        packageRequires = [ compat emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/transient.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    transient-cycles = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "transient-cycles";
-        ename = "transient-cycles";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar";
-          sha256 = "0s6cxagqxj4i3qf4kx8mdrihciz3v6ga7zw19jcv896rdhx75bx5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tree-inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib, treeview }:
-      elpaBuild {
-        pname = "tree-inspector";
-        ename = "tree-inspector";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar";
-          sha256 = "0v59kp1didml9k245m1v0s0ahh2r79cc0hp5ika93iamrdxkxaiz";
-        };
-        packageRequires = [ emacs treeview ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }:
-      elpaBuild {
-        pname = "trie";
-        ename = "trie";
-        version = "0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/trie-0.6.tar";
-          sha256 = "1jvhvvxkxbbpy93x9kpznvp2hqkkbdbbjaj27fd0wkbijg0k03ln";
-        };
-        packageRequires = [ heap tNFA ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/trie.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    triples = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "triples";
-        ename = "triples";
-        version = "0.3.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/triples-0.3.5.tar";
-          sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/triples.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    typo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "typo";
-        ename = "typo";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/typo-1.0.1.tar";
-          sha256 = "1w4m2admlgmx7d661l70rryyxbaahfvrvhxc1b9sq41nx88bmgn1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/typo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ulisp-repl = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "ulisp-repl";
-        ename = "ulisp-repl";
-        version = "1.0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ulisp-repl-1.0.3.tar";
-          sha256 = "1c23d66vydfp29px2dlvgl5xg91a0rh4w4b79q8ach533nfag3ia";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    undo-tree = callPackage ({ elpaBuild, fetchurl, lib, queue }:
-      elpaBuild {
-        pname = "undo-tree";
-        ename = "undo-tree";
-        version = "0.8.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar";
-          sha256 = "0ad1zhkjdf73j3b2i8nd7f10jlqqvcaa852yycms4jr636xw6ms6";
-        };
-        packageRequires = [ queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/undo-tree.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "uni-confusables";
-        ename = "uni-confusables";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar";
-          sha256 = "08150kgqsbcpykvf8m2b25y386h2b4pj08vffm6wh4f000wr72k3";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    uniquify-files = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "uniquify-files";
-        ename = "uniquify-files";
-        version = "1.0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar";
-          sha256 = "0xw2l49xhdy5qgwja8bkiq2ibdppl45xzqlr17z92l1vfq4akpzp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    urgrep = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "urgrep";
-        ename = "urgrep";
-        version = "0.5.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar";
-          sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi";
-        };
-        packageRequires = [ compat emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/urgrep.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    url-http-ntlm = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , fetchurl
-                                 , lib
-                                 , nadvice
-                                 , ntlm ? null }:
-      elpaBuild {
-        pname = "url-http-ntlm";
-        ename = "url-http-ntlm";
-        version = "2.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar";
-          sha256 = "02b65z70kw37mzj2hh8q6z0zhhacf9sc4hlczpfxdfsy05b8yri9";
-        };
-        packageRequires = [ cl-lib nadvice ntlm ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    url-http-oauth = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "url-http-oauth";
-        ename = "url-http-oauth";
-        version = "0.8.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/url-http-oauth-0.8.3.tar";
-          sha256 = "06lpzh8kpxn8cr92blxrjw44h2cfc6fw0pr024sign4acczx10ws";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/url-http-oauth.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "url-scgi";
-        ename = "url-scgi";
-        version = "0.9";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar";
-          sha256 = "19lvr4d2y9rd5gibaavp7ghkxmdh5zad9ynarbi2w4rjgmz5y981";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/url-scgi.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    use-package = callPackage ({ bind-key, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "use-package";
-        ename = "use-package";
-        version = "2.4.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar";
-          sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp";
-        };
-        packageRequires = [ bind-key emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/use-package.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    validate = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , seq }:
-      elpaBuild {
-        pname = "validate";
-        ename = "validate";
-        version = "1.0.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/validate-1.0.4.tar";
-          sha256 = "1bn25l62zcabg2ppxwr4049m1qd0yj095cflqrak0n50acgjs6w5";
-        };
-        packageRequires = [ cl-lib emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/validate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "valign";
-        ename = "valign";
-        version = "3.1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/valign-3.1.1.tar";
-          sha256 = "16v2mmrih0ykk4z6qmy29gajjb3v83q978gzn3y6pg8y48b2wxpb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/valign.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-backup = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "vc-backup";
-        ename = "vc-backup";
-        version = "1.1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar";
-          sha256 = "0a45bbrvk4s9cj3ih3hb6vqjv4hkwnz7m9a4mr45m6cb0sl9b8a3";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-backup.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vc-got";
-        ename = "vc-got";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vc-got-1.2.tar";
-          sha256 = "04m1frrnla4zc8db728280r9fbk50bgjkk4k7dizb0hawghk4r3p";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-got.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vc-hgcmd";
-        ename = "vc-hgcmd";
-        version = "1.14.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar";
-          sha256 = "0a8a4d9difrp2r6ac8micxn8ij96inba390324w087yxwqzkgk1g";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vcard";
-        ename = "vcard";
-        version = "0.2.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar";
-          sha256 = "0r56y3q2gigm8rxifly50m5h1k948y987541cqd8w207wf1b56bh";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vcard.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "vcl-mode";
-        ename = "vcl-mode";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vcl-mode-1.1.tar";
-          sha256 = "0zz664c263x24xzs7hk2mqchzplmx2dlba98d5fpy8ybdnziqfkj";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }:
-      elpaBuild {
-        pname = "vdiff";
-        ename = "vdiff";
-        version = "0.2.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar";
-          sha256 = "0crgb32dk0yzcgvjai0b67wcbcfppc3h0ppfqgdrim1nincbwc1m";
-        };
-        packageRequires = [ emacs hydra ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vdiff.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    verilog-mode = callPackage ({ elpaBuild
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "verilog-mode";
-        ename = "verilog-mode";
-        version = "2024.3.1.121933719";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar";
-          sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/verilog-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vertico";
-        ename = "vertico";
-        version = "1.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-1.8.tar";
-          sha256 = "0k6sfla0183vyjf2yd9sycck9nxz0x659kygxgiaip3zq7f9zkg8";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vertico.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vertico-posframe = callPackage ({ elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , lib
-                                    , posframe
-                                    , vertico }:
-      elpaBuild {
-        pname = "vertico-posframe";
-        ename = "vertico-posframe";
-        version = "0.7.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar";
-          sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy";
-        };
-        packageRequires = [ emacs posframe vertico ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vertico-posframe.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vigenere";
-        ename = "vigenere";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vigenere-1.0.tar";
-          sha256 = "1zlni6amznzi9w96kj7lnhfrr049crva2l8kwl5jsvyaj5fc6nq5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vigenere.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    visual-filename-abbrev = callPackage ({ elpaBuild
-                                          , emacs
-                                          , fetchurl
-                                          , lib }:
-      elpaBuild {
-        pname = "visual-filename-abbrev";
-        ename = "visual-filename-abbrev";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar";
-          sha256 = "0vy4ar10wbdykzl47xnrfcwszjxyq2f1vhdbynfcmkcyrr40v4wm";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    visual-fill = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "visual-fill";
-        ename = "visual-fill";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/visual-fill-0.2.tar";
-          sha256 = "00r3cclhrdx5y0h1p1rrx5psvc8d95dayzpjdsy9xj44i8pcnvja";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/visual-fill.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vlf = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "vlf";
-        ename = "vlf";
-        version = "1.7.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar";
-          sha256 = "1napxdavsrwb5dq2i4ka06rhmmfk6qixc8mm2a6ab68iavprrqkv";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vlf.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vundo";
-        ename = "vundo";
-        version = "2.3.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar";
-          sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vundo.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "wcheck-mode";
-        ename = "wcheck-mode";
-        version = "2021";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar";
-          sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "wconf";
-        ename = "wconf";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wconf-0.2.1.tar";
-          sha256 = "1ci5ysn2w9hjzcsv698b6mh14qbrmvlzn4spaq4wzwl9p8672n08";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wconf.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "web-server";
-        ename = "web-server";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar";
-          sha256 = "0wikajm4pbffcy8clwwb5bnz67isqmcsbf9kca8rzx4svzi5j2gc";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/web-server.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    webfeeder = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "webfeeder";
-        ename = "webfeeder";
-        version = "1.1.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar";
-          sha256 = "0418fpw2ra12n77560gh9j9ymv28d895bdhpr7x9xakvijjh705m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/webfeeder.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "websocket";
-        ename = "websocket";
-        version = "1.15";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/websocket-1.15.tar";
-          sha256 = "0cm3x6qzr4zqj46w0qfpn7n9g5z80figcv824869snvc74465h1g";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/websocket.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "which-key";
-        ename = "which-key";
-        version = "3.6.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar";
-          sha256 = "1lf8q6sq0hnrspj6qy49i48az3js24ab4y0gksw4giiifiqlc5ba";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/which-key.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    window-commander = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "window-commander";
-        ename = "window-commander";
-        version = "3.0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar";
-          sha256 = "15345sgdmgz0vv9bk2cmffjp66i0msqj0xn2cxl7wny3bkfx8amv";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/window-commander.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    window-tool-bar = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "window-tool-bar";
-        ename = "window-tool-bar";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar";
-          sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "windower";
-        ename = "windower";
-        version = "0.0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/windower-0.0.1.el";
-          sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/windower.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    windresize = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "windresize";
-        ename = "windresize";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/windresize-0.1.tar";
-          sha256 = "1wjqrwrfql5c67yv59hc95ga0mkvrqz74gy46aawhn8r3xr65qai";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/windresize.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wisi = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "wisi";
-        ename = "wisi";
-        version = "4.3.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar";
-          sha256 = "0qa6nig33igv4sqk3fxzrmx889pswq10smj9c9l3phz2acqx8q92";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wisi.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wisitoken-grammar-mode = callPackage ({ elpaBuild
-                                          , emacs
-                                          , fetchurl
-                                          , lib
-                                          , mmm-mode
-                                          , wisi }:
-      elpaBuild {
-        pname = "wisitoken-grammar-mode";
-        ename = "wisitoken-grammar-mode";
-        version = "1.3.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar";
-          sha256 = "0i0vy751ycbfp8l8ynzj6iqgvc3scllwysdchpjv4lyj0m7m3s20";
-        };
-        packageRequires = [ emacs mmm-mode wisi ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "wpuzzle";
-        ename = "wpuzzle";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wpuzzle-1.1.tar";
-          sha256 = "05dgvr1miqp870nl7c8dw7j1kv4mgwm8scynjfwbs9wjz4xmzc6c";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wrap-search = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "wrap-search";
-        ename = "wrap-search";
-        version = "4.16.13";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wrap-search-4.16.13.tar";
-          sha256 = "0h5wlvmxq1rcmkhmaan3118w5480xx1gblg73lsfhxnj2xkmhrbi";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wrap-search.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xclip = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "xclip";
-        ename = "xclip";
-        version = "1.11";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xclip-1.11.tar";
-          sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xclip.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xeft";
-        ename = "xeft";
-        version = "3.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xeft-3.3.tar";
-          sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xeft.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xelb = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xelb";
-        ename = "xelb";
-        version = "0.20";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.20.tar";
-          sha256 = "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xelb.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xpm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }:
-      elpaBuild {
-        pname = "xpm";
-        ename = "xpm";
-        version = "1.0.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xpm-1.0.5.tar";
-          sha256 = "12a12rmbc1c0j60nv1s8fgg3r2lcjw8hs7qpyscm7ggwanylxn6q";
-        };
-        packageRequires = [ cl-lib queue ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xpm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xr";
-        ename = "xr";
-        version = "1.25";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xr-1.25.tar";
-          sha256 = "0jmhcrz6mj3fwm9acwv1jj6nlnqikprjgvglr3cgxysinqh6y3xi";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xr.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xref";
-        ename = "xref";
-        version = "1.7.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xref-1.7.0.tar";
-          sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xref.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xref-union = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xref-union";
-        ename = "xref-union";
-        version = "0.2.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar";
-          sha256 = "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xref-union.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    yasnippet = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "yasnippet";
-        ename = "yasnippet";
-        version = "0.14.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar";
-          sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/yasnippet.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    yasnippet-classic-snippets = callPackage ({ elpaBuild
-                                              , fetchurl
-                                              , lib
-                                              , yasnippet }:
-      elpaBuild {
-        pname = "yasnippet-classic-snippets";
-        ename = "yasnippet-classic-snippets";
-        version = "1.0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar";
-          sha256 = "1qiw5592mj8gmq1lhdcpxfza7iqn4cmhn36vdskfa7zpd1lq26y1";
-        };
-        packageRequires = [ yasnippet ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    zones = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "zones";
-        ename = "zones";
-        version = "2023.6.11";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar";
-          sha256 = "1z3kq0lfc4fbr9dnk9kj2hqcv60bnjp0x4kbxaxy77vv02a62rzc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/zones.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ztree";
-        ename = "ztree";
-        version = "1.0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar";
-          sha256 = "1yyh09jff31j5w6mqsnibig3wizv7acsw39pjjfv1rmngni2b8zi";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ztree.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "zuul";
-        ename = "zuul";
-        version = "0.4.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar";
-          sha256 = "1mj54hm4cqidrmbxyqdjfsc3qcmjhbl0wii79bydx637dvpfvqgf";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/zuul.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-  }
+{
+  ace-window = callPackage (
+    {
+      avy,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ace-window";
+      ename = "ace-window";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar";
+        sha256 = "1sdzk1hgi3axqqbxf6aq1v5j3d8bybkz40dk8zqn49xxxfmzbdv4";
+      };
+      packageRequires = [ avy ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ace-window.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ack = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ack";
+      ename = "ack";
+      version = "1.11";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ack-1.11.tar";
+        sha256 = "1ji02v3qis5sx7hpaaxksgh2jqxzzilagz6z33kjb1lds1sq4z2c";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ack.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  activities = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      persist,
+    }:
+    elpaBuild {
+      pname = "activities";
+      ename = "activities";
+      version = "0.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/activities-0.7.tar";
+        sha256 = "1775cdk9hv257m6l7icg247fc36g7lwgjg8iivj52m6qg7p7cz9g";
+      };
+      packageRequires = [
+        emacs
+        persist
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/activities.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ada-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      gnat-compiler,
+      lib,
+      uniquify-files,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "ada-mode";
+      ename = "ada-mode";
+      version = "8.1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar";
+        sha256 = "10k514al716qjx3qg1m4k1rnf70fa73vrmmx3pp75zrw1d0db9y6";
+      };
+      packageRequires = [
+        emacs
+        gnat-compiler
+        uniquify-files
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ada-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ada-ref-man = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ada-ref-man";
+      ename = "ada-ref-man";
+      version = "2020.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar";
+        sha256 = "0ijgl9lnmn8n3pllgh3apl2shbl38f3fxn8z5yy4q6pqqx0vr3fn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ada-ref-man.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  adaptive-wrap = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "adaptive-wrap";
+      ename = "adaptive-wrap";
+      version = "0.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar";
+        sha256 = "1dz5mi21v2wqh969m3xggxbzq3qf78hps418rzl73bb57l837qp8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  adjust-parens = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "adjust-parens";
+      ename = "adjust-parens";
+      version = "3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar";
+        sha256 = "1gdlykg7ix3833s40152p1ji4r1ycp18niqjr1f994y4ydqxq8yl";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/adjust-parens.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  advice-patch = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "advice-patch";
+      ename = "advice-patch";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/advice-patch-0.1.tar";
+        sha256 = "0km891648k257k4d6hbrv6jyz9663kww8gfarvzf9lv8i4qa5scp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/advice-patch.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aggressive-completion = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aggressive-completion";
+      ename = "aggressive-completion";
+      version = "1.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar";
+        sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aggressive-completion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aggressive-indent = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aggressive-indent";
+      ename = "aggressive-indent";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar";
+        sha256 = "1c27g9qhqc4bh96bkxdcjbrhiwi7kzki1l4yhxvyvwwarisl6c7b";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ahungry-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ahungry-theme";
+      ename = "ahungry-theme";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar";
+        sha256 = "16k6wm1qss5bk45askhq5vswrqsjic5dijpkgnmwgvm8xsdlvni6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ahungry-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aircon-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aircon-theme";
+      ename = "aircon-theme";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar";
+        sha256 = "0dcnlk3q95bcghlwj8ii40xxhspnfbqcr9mvj1v3adl1s623fyp0";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aircon-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  all = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "all";
+      ename = "all";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/all-1.1.tar";
+        sha256 = "067c5ynklw1inbjwd1l6dkbpx3vw487qv39y7mdl55a6nqx7hgk4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/all.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  altcaps = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "altcaps";
+      ename = "altcaps";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar";
+        sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/altcaps.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ampc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ampc";
+      ename = "ampc";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ampc-0.2.tar";
+        sha256 = "17l2c5hr7cq0vf4qc8s2adwlhqp74glc4v909h0jcavrnbn8yn80";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ampc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  arbitools = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "arbitools";
+      ename = "arbitools";
+      version = "0.977";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/arbitools-0.977.tar";
+        sha256 = "0s5dpprx24fxm0qk8nzm39c16ydiq97wzz3l7zi69r3l9wf31rb3";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/arbitools.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ascii-art-to-unicode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ascii-art-to-unicode";
+      ename = "ascii-art-to-unicode";
+      version = "1.13";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.tar";
+        sha256 = "0qlh8zi691gz7s1ayp1x5ga3sj3rfy79y21r6hqf696mrkgpz1d8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  assess = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      m-buffer,
+    }:
+    elpaBuild {
+      pname = "assess";
+      ename = "assess";
+      version = "0.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/assess-0.7.tar";
+        sha256 = "1wka2idr63bn8fgh0cz4lf21jvlhkr895y0xnh3syp9vrss5hzsp";
+      };
+      packageRequires = [
+        emacs
+        m-buffer
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/assess.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  async = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "async";
+      ename = "async";
+      version = "1.9.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/async-1.9.8.tar";
+        sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/async.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auctex = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auctex";
+      ename = "auctex";
+      version = "14.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar";
+        sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auctex.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auctex-cont-latexmk = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auctex-cont-latexmk";
+      ename = "auctex-cont-latexmk";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar";
+        sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auctex-label-numbers = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auctex-label-numbers";
+      ename = "auctex-label-numbers";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar";
+        sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  aumix-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "aumix-mode";
+      ename = "aumix-mode";
+      version = "7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/aumix-mode-7.tar";
+        sha256 = "08baz31hm0nhikqg5h294kg5m4qkiayjhirhb57v57g5722jfk3m";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/aumix-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-correct = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-correct";
+      ename = "auto-correct";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.tar";
+        sha256 = "05ky3qxbvxrkywpqj6syl7ll6za74fhjzrcia6wdmxsnjya5qbf1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-correct.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-header = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-header";
+      ename = "auto-header";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/auto-header-0.1.2.tar";
+        sha256 = "0p22bpdy29i7ff8rzjh1qzvj4d8igl36gs1981kmds4qz23qn447";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-header.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-overlays = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-overlays";
+      ename = "auto-overlays";
+      version = "0.10.10";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar";
+        sha256 = "0jn7lk8vzdrf0flxwwx295z0mrghd3lyspfadwz35c6kygvy8078";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-overlays.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  autocrypt = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "autocrypt";
+      ename = "autocrypt";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/autocrypt-0.4.2.tar";
+        sha256 = "0mc4vb6x7qzn29dg9m05zgli6mwh9cj4vc5n6hvarzkn9lxl6mr3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/autocrypt.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  avy = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "avy";
+      ename = "avy";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/avy-0.5.0.tar";
+        sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/avy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bbdb = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bbdb";
+      ename = "bbdb";
+      version = "3.2.2.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar";
+        sha256 = "1ymjydf54z3rbkxk4irvan5s8lc8wdhk01691741vfznx0nsc4a2";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bbdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  beacon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "beacon";
+      ename = "beacon";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar";
+        sha256 = "1hxb6vyvpppj7yzphknmh8m4a1h89lg6jr98g4d62k0laxazvdza";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/beacon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  beframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "beframe";
+      ename = "beframe";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar";
+        sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/beframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bicep-ts-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bicep-ts-mode";
+      ename = "bicep-ts-mode";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.3.tar";
+        sha256 = "02377gsdnfvvydjw014p2y6y74nd5zfh1ghq5l9ayq0ilvv8fmx7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bind-key = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bind-key";
+      ename = "bind-key";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bind-key-2.4.1.tar";
+        sha256 = "0jrbm2l6h4r7qjcdcsfczbijmbf3njzzzrymv08zanchmy7lvsv2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bind-key.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  blist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ilist,
+      lib,
+    }:
+    elpaBuild {
+      pname = "blist";
+      ename = "blist";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/blist-0.3.tar";
+        sha256 = "1p10d9q14px19m3vajqmm71lmnbxxsc7qczgq11vhg485c20y3va";
+      };
+      packageRequires = [
+        emacs
+        ilist
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/blist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bluetooth = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bluetooth";
+      ename = "bluetooth";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar";
+        sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bluetooth.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bnf-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bnf-mode";
+      ename = "bnf-mode";
+      version = "0.4.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar";
+        sha256 = "1x6km8rhhb5bkas3yfmjfpyxlhyxkqnzviw1pqlq88c95j88h3d4";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bnf-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  boxy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "boxy";
+      ename = "boxy";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar";
+        sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/boxy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  boxy-headings = callPackage (
+    {
+      boxy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "boxy-headings";
+      ename = "boxy-headings";
+      version = "2.1.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar";
+        sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc";
+      };
+      packageRequires = [
+        boxy
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/boxy-headings.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  breadcrumb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "breadcrumb";
+      ename = "breadcrumb";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/breadcrumb-1.0.1.tar";
+        sha256 = "1s69a2z183mla4d4b5pcsswbwa3hjvsg1xj7r3hdw6j841b0l9dw";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/breadcrumb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  brief = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "brief";
+      ename = "brief";
+      version = "5.91";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/brief-5.91.tar";
+        sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/brief.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buffer-env = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buffer-env";
+      ename = "buffer-env";
+      version = "0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar";
+        sha256 = "08qaw4y1sszhh97ih13vfrm0r1nn1k410f2wwvffvncxhqgxz5lv";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buffer-env.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buffer-expose = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buffer-expose";
+      ename = "buffer-expose";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.tar";
+        sha256 = "1ymjjjrbknp3hdfwd8zyzfrsn5n267245ffmplm7yk2s34kgxr0n";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buffer-expose.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bufferlo = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bufferlo";
+      ename = "bufferlo";
+      version = "0.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar";
+        sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bufferlo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bug-hunter = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "bug-hunter";
+      ename = "bug-hunter";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.tar";
+        sha256 = "0cgwq8b6jglbg9ydvf80ijgbbccrks3yb9af46sdd6aqdmvdlx21";
+      };
+      packageRequires = [
+        cl-lib
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bug-hunter.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buildbot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buildbot";
+      ename = "buildbot";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar";
+        sha256 = "056jakpyslizsp8sik5f7m90dpcga8y38hb5rh1yfa7k1xwcrrk2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buildbot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  calibre = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "calibre";
+      ename = "calibre";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar";
+        sha256 = "1ak05y3cmmwpg8bijkwl97kvfxhxh9xxc74askyafc50n0jvaq87";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/calibre.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cape = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cape";
+      ename = "cape";
+      version = "1.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cape-1.5.tar";
+        sha256 = "1kg5a2x23gmdcv8kwzmz8qjfr05r9rfzwb7cj38ambpqpppxl7ij";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  capf-autosuggest = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "capf-autosuggest";
+      ename = "capf-autosuggest";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar";
+        sha256 = "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  caps-lock = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "caps-lock";
+      ename = "caps-lock";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/caps-lock-1.0.tar";
+        sha256 = "1yy4kjc1zlpzkam0jj8h3v5h23wyv1yfvwj2drknn59d8amc1h4y";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/caps-lock.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  captain = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "captain";
+      ename = "captain";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/captain-1.0.3.tar";
+        sha256 = "0l8z8bqk705jdl7gvd2x7nhs0z6gn3swk5yzp3mnhjcfda6whz8l";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/captain.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  chess = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "chess";
+      ename = "chess";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/chess-2.0.5.tar";
+        sha256 = "0dgmp7ymjyb5pa93n05s0d4ql7wk98r9s4f9w35yahgqk9xvqclj";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/chess.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cl-generic = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cl-generic";
+      ename = "cl-generic";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cl-generic-0.3.tar";
+        sha256 = "0dqn484xb25ifiqd9hqdrs954c74akrf95llx23b2kzf051pqh1k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cl-generic.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cl-lib = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cl-lib";
+      ename = "cl-lib";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar";
+        sha256 = "1wpdg2zwhzxv4bkx9ldiwd16l6244wakv8yphrws4mnymkxvf2q1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cl-lib.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  clipboard-collector = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "clipboard-collector";
+      ename = "clipboard-collector";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar";
+        sha256 = "0v70f9pljq3jar3d1vpaj48nhrg90jzsvqcbzgv54989w8rvvcd6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/clipboard-collector.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cobol-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cobol-mode";
+      ename = "cobol-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar";
+        sha256 = "0aicx6vvhgn0fvikbq74vnvvwh228pxdqf52sbiffhzgb7pkbvcj";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  code-cells = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "code-cells";
+      ename = "code-cells";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/code-cells-0.4.tar";
+        sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/code-cells.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  colorful-mode = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "colorful-mode";
+      ename = "colorful-mode";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar";
+        sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  comint-mime = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "comint-mime";
+      ename = "comint-mime";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar";
+        sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/comint-mime.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  compact-docstrings = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "compact-docstrings";
+      ename = "compact-docstrings";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.tar";
+        sha256 = "00fjhfysjyqigkg0icxlqw6imzhjk5xhlxmxxs1jiafhn55dbcpj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/compact-docstrings.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "company";
+      ename = "company";
+      version = "0.10.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/company-0.10.2.tar";
+        sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company-ebdb = callPackage (
+    {
+      company,
+      ebdb,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "company-ebdb";
+      ename = "company-ebdb";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/company-ebdb-1.1.tar";
+        sha256 = "1ym0r7y90n4d6grd4l02rxk096gsjmw9j81slig0pq1ky33rb6ks";
+      };
+      packageRequires = [
+        company
+        ebdb
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company-math = callPackage (
+    {
+      company,
+      elpaBuild,
+      fetchurl,
+      lib,
+      math-symbol-lists,
+    }:
+    elpaBuild {
+      pname = "company-math";
+      ename = "company-math";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar";
+        sha256 = "16ya3yscxxmz9agi0nc5pi43wkfv45lh1zd89yqfc7zcw02nsnld";
+      };
+      packageRequires = [
+        company
+        math-symbol-lists
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company-math.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  company-statistics = callPackage (
+    {
+      company,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "company-statistics";
+      ename = "company-statistics";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar";
+        sha256 = "1gfwhgv7q9d3xjgaim25diyd6jfl9w3j07qrssphcrdxv0q24d14";
+      };
+      packageRequires = [
+        company
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/company-statistics.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  compat = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "compat";
+      ename = "compat";
+      version = "30.0.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar";
+        sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/compat.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult";
+      ename = "consult";
+      version = "1.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/consult-1.7.tar";
+        sha256 = "02ji5yxa92jj7chs6al5amjdag1waz2sngbbk45mgg9nv81b4d3c";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-denote = callPackage (
+    {
+      consult,
+      denote,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-denote";
+      ename = "consult-denote";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar";
+        sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1";
+      };
+      packageRequires = [
+        consult
+        denote
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-denote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-hoogle = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      haskell-mode,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-hoogle";
+      ename = "consult-hoogle";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar";
+        sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr";
+      };
+      packageRequires = [
+        emacs
+        haskell-mode
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-recoll = callPackage (
+    {
+      consult,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-recoll";
+      ename = "consult-recoll";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar";
+        sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v";
+      };
+      packageRequires = [
+        consult
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  context-coloring = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "context-coloring";
+      ename = "context-coloring";
+      version = "8.1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar";
+        sha256 = "0mqdl34g493pps85ckin5i3iz8kwlqkcwjvsf2sj4nldjvvfk1ng";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/context-coloring.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  corfu = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "corfu";
+      ename = "corfu";
+      version = "1.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/corfu-1.4.tar";
+        sha256 = "0jsxrs08zwbwb1mzn8a2ja3wr2w34cx8ca09l4fz05labv7p7i85";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/corfu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  coterm = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "coterm";
+      ename = "coterm";
+      version = "1.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/coterm-1.6.tar";
+        sha256 = "0kgsg99dggirz6asyppwx1ydc0jh62xd1bfhnm2hyby5qkqz1yvk";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/coterm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  counsel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+      swiper,
+    }:
+    elpaBuild {
+      pname = "counsel";
+      ename = "counsel";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar";
+        sha256 = "10jajfl2vhqj2awy991kqrf1hcsj8nkvn760cbxjsm2lhzvqqhj3";
+      };
+      packageRequires = [
+        emacs
+        ivy
+        swiper
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/counsel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cpio-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cpio-mode";
+      ename = "cpio-mode";
+      version = "0.17";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar";
+        sha256 = "13jay5c36svq2r78gwp7d1slpkkzrx749q28554mxd855fr6pvaj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cpupower = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cpupower";
+      ename = "cpupower";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar";
+        sha256 = "155fhf38p95a5ws6jzpczw0z03zwbsqzdwj50v3grjivyp74pddz";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cpupower.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  crdt = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "crdt";
+      ename = "crdt";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/crdt-0.3.5.tar";
+        sha256 = "038qivbw02h1i98ym0fwx72x05gm0j4h93a54v1l7g25drm5zm83";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/crdt.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  crisp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "crisp";
+      ename = "crisp";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/crisp-1.3.6.tar";
+        sha256 = "0am7gwadjp0nwlvf7y4sp9brbm0234k55bnxfv44lkwdf502mq8y";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/crisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  csharp-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "csharp-mode";
+      ename = "csharp-mode";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar";
+        sha256 = "1jjxq5vkqq2v8rkcm2ygggpg355aqmrl2hdhh1xma3jlnj5carnf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/csharp-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  csv-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "csv-mode";
+      ename = "csv-mode";
+      version = "1.25";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/csv-mode-1.25.tar";
+        sha256 = "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/csv-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cursory = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cursory";
+      ename = "cursory";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar";
+        sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cursory.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cycle-quotes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cycle-quotes";
+      ename = "cycle-quotes";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar";
+        sha256 = "1glf8sd3gqp9qbd238vxd3aprdz93f887893xji3ybqli36i2xs1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cycle-quotes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dape = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      jsonrpc,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dape";
+      ename = "dape";
+      version = "0.13.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dape-0.13.0.tar";
+        sha256 = "1zzghp73yh1vl9vf3njkqyhh6vmmx6klnd9z37p62467bd19wr8a";
+      };
+      packageRequires = [
+        emacs
+        jsonrpc
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  darkroom = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "darkroom";
+      ename = "darkroom";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/darkroom-0.3.tar";
+        sha256 = "0gxixkai8awc77vzckwljmyapdnxw5j9ajxmlr8rq42994gjr4fm";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/darkroom.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dash = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dash";
+      ename = "dash";
+      version = "2.19.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dash-2.19.1.tar";
+        sha256 = "1c7yibfikkwlip8zh4kiamh3kljil3hyl250g8fkxpdyhljjdk6m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dash.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dbus-codegen = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dbus-codegen";
+      ename = "dbus-codegen";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.tar";
+        sha256 = "0d3sbqs5r8578629inx8nhqvx0kshf41d00c8dpc75v4b2vx0h6w";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dbus-codegen.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  debbugs = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      soap-client,
+    }:
+    elpaBuild {
+      pname = "debbugs";
+      ename = "debbugs";
+      version = "0.40";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/debbugs-0.40.tar";
+        sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl";
+      };
+      packageRequires = [
+        emacs
+        soap-client
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/debbugs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  delight = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "delight";
+      ename = "delight";
+      version = "1.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/delight-1.7.tar";
+        sha256 = "1j7srr0i7s9hcny45m8zmj33nl9g6zi55cbkdzzlbx6si2rqwwlj";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/delight.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote";
+      ename = "denote";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-3.0.6.tar";
+        sha256 = "1wq44r4j624hiwpyzkrrbk998321wzj7x45y9rwy4gpi8f6xi1nv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-menu = callPackage (
+    {
+      denote,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-menu";
+      ename = "denote-menu";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar";
+        sha256 = "042avabc97wgkz85x40dq7rmv4h9n5kmq935lrg9s20klbs9axs1";
+      };
+      packageRequires = [
+        denote
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  detached = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "detached";
+      ename = "detached";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/detached-0.10.1.tar";
+        sha256 = "0w6xgidi0g1pc13xfm8hcgmc7i2h5brj443cykwgvr5wkqnpmp9m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/detached.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devdocs = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devdocs";
+      ename = "devdocs";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/devdocs-0.6.1.tar";
+        sha256 = "04m3jd3wymrsdlb1i7z6dz9pf1q8q38ihkbn3jisdca6xkk9jd6p";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/devdocs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devicetree-ts-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devicetree-ts-mode";
+      ename = "devicetree-ts-mode";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar";
+        sha256 = "06j385pvlhd7hp9isqp5gcf378m8p6578q6nz81r8dx93ymaak79";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dict-tree = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      heap,
+      lib,
+      tNFA,
+      trie,
+    }:
+    elpaBuild {
+      pname = "dict-tree";
+      ename = "dict-tree";
+      version = "0.17";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar";
+        sha256 = "0p4j0m3b9i38l4rcgzdps95wqk27zz156d4q73vq054kpcphrfpp";
+      };
+      packageRequires = [
+        emacs
+        heap
+        tNFA
+        trie
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dict-tree.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diff-hl = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diff-hl";
+      ename = "diff-hl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar";
+        sha256 = "0skla012qw55qhzykgrk3zk5x76dfsj11kq8q2msyrq3jxcbyq6p";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diff-hl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diffview = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diffview";
+      ename = "diffview";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/diffview-1.0.el";
+        sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diffview.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diminish = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diminish";
+      ename = "diminish";
+      version = "0.46";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/diminish-0.46.tar";
+        sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diminish.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-du = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-du";
+      ename = "dired-du";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar";
+        sha256 = "066yjy9vdbf20adcqdcknk5b0ml18fy2bm9gkgcp0qfg37yy1yjg";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-du.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-duplicates = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-duplicates";
+      ename = "dired-duplicates";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dired-duplicates-0.4.tar";
+        sha256 = "1srih47bq7szg6n3qlz4yzzcijg79p8xpwmi5c4v9xscl94nnc4z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-duplicates.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-git-info = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-git-info";
+      ename = "dired-git-info";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.tar";
+        sha256 = "0rryvlbqx1j48wafja15yc39jd0fzgz9i6bzmq9jpql3w9445772";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-git-info.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dired-preview = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dired-preview";
+      ename = "dired-preview";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar";
+        sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dired-preview.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  disk-usage = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "disk-usage";
+      ename = "disk-usage";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.tar";
+        sha256 = "02i7i7mrn6ky3lzhcadvq7wlznd0b2ay107h2b3yh4wwwxjxymyg";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/disk-usage.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dismal = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dismal";
+      ename = "dismal";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar";
+        sha256 = "1706m5ya6q0jf8mzfkqn47aqd7ygm88fm7pvzbd4cry30mjs5vki";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dismal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  djvu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "djvu";
+      ename = "djvu";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar";
+        sha256 = "0z74aicvy680m1d6v5zk5pcpkd310jqqdxadpjcbnjcybzp1zisq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/djvu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  do-at-point = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "do-at-point";
+      ename = "do-at-point";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar";
+        sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/do-at-point.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  doc-toc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "doc-toc";
+      ename = "doc-toc";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar";
+        sha256 = "09xwa0xgnzlaff0j5zy3kam6spcnw0npppc3gf6ka5bizbk4dq99";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/doc-toc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  docbook = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "docbook";
+      ename = "docbook";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/docbook-0.1.tar";
+        sha256 = "1kn71kpyb1maww414zgpc1ccgb02mmaiaix06jyqhf75hfxms2lv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/docbook.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  drepl = callPackage (
+    {
+      comint-mime,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "drepl";
+      ename = "drepl";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/drepl-0.3.tar";
+        sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds";
+      };
+      packageRequires = [
+        comint-mime
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/drepl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dts-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dts-mode";
+      ename = "dts-mode";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar";
+        sha256 = "16ads9xjbqgmgwzj63anhc6yb1j79qpcnxjafqrzdih1p5j7hrr9";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  easy-escape = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "easy-escape";
+      ename = "easy-escape";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar";
+        sha256 = "0mwam1a7sl90aqgz6mj3zm0w1dq15b5jpxmwxv21xs1imyv696ci";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/easy-escape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  easy-kill = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "easy-kill";
+      ename = "easy-kill";
+      version = "0.9.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar";
+        sha256 = "1nwhqidy5zq6j867b21zng5ppb7n56drnhn3wjs7hjmkf23r63qy";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/easy-kill.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ebdb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "ebdb";
+      ename = "ebdb";
+      version = "0.8.22";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar";
+        sha256 = "0nmrhjk2ddml115ibsy8j4crw5hzq9fa94v8y41iyj9h3gf8irzc";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ebdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ebdb-gnorb = callPackage (
+    {
+      ebdb,
+      elpaBuild,
+      fetchurl,
+      gnorb,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ebdb-gnorb";
+      ename = "ebdb-gnorb";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.tar";
+        sha256 = "1kwcrg268vmskls9p4ccs6ybdip30cb4fw3xzq11gqjch1nssh18";
+      };
+      packageRequires = [
+        ebdb
+        gnorb
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ebdb-i18n-chn = callPackage (
+    {
+      ebdb,
+      elpaBuild,
+      fetchurl,
+      lib,
+      pyim,
+    }:
+    elpaBuild {
+      pname = "ebdb-i18n-chn";
+      ename = "ebdb-i18n-chn";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar";
+        sha256 = "1qyia40z6ssvnlpra116avakyf81vqn42860ny21g0zsl99a58j2";
+      };
+      packageRequires = [
+        ebdb
+        pyim
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ediprolog = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ediprolog";
+      ename = "ediprolog";
+      version = "2.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar";
+        sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ediprolog.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eev = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "eev";
+      ename = "eev";
+      version = "20240710";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/eev-20240710.tar";
+        sha256 = "1mia27ilfg4zkkwvwy3m24ypgi1fm8k27rm77xwjpq87pb2wvr02";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eev.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ef-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ef-themes";
+      ename = "ef-themes";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar";
+        sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ef-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eglot = callPackage (
+    {
+      eldoc,
+      elpaBuild,
+      emacs,
+      external-completion,
+      fetchurl,
+      flymake ? null,
+      jsonrpc,
+      lib,
+      project,
+      seq,
+      xref,
+    }:
+    elpaBuild {
+      pname = "eglot";
+      ename = "eglot";
+      version = "1.17";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/eglot-1.17.tar";
+        sha256 = "1cnx522wb49f1dkm80sigz3kvzrblmq5b1lnfyq9wdnh6zdm4l00";
+      };
+      packageRequires = [
+        eldoc
+        emacs
+        external-completion
+        flymake
+        jsonrpc
+        project
+        seq
+        xref
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eglot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  el-search = callPackage (
+    {
+      cl-print ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      stream,
+    }:
+    elpaBuild {
+      pname = "el-search";
+      ename = "el-search";
+      version = "1.12.6.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar";
+        sha256 = "1vq8cp2icpl8vkc9r8brzbn0mpaj03mnvdz1bdqn8nqrzc3w0h24";
+      };
+      packageRequires = [
+        cl-print
+        emacs
+        stream
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/el-search.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eldoc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "eldoc";
+      ename = "eldoc";
+      version = "1.15.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar";
+        sha256 = "05fgk3y2rp0xrm3x0xmf9fm72l442y7ydxxg3xk006d9cq06h8kz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eldoc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  electric-spacing = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "electric-spacing";
+      ename = "electric-spacing";
+      version = "5.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/electric-spacing-5.0.tar";
+        sha256 = "1gr35nri25ycxr0wwkypky8zv43nnfrilx4jaj66mb9jsyix6smi";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/electric-spacing.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elisp-benchmarks = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "elisp-benchmarks";
+      ename = "elisp-benchmarks";
+      version = "1.16";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.16.tar";
+        sha256 = "0v5db89z6hirvixgjwyz3a9dkx6xf486hy51sprvslki706m08p2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ellama = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      llm,
+      spinner,
+    }:
+    elpaBuild {
+      pname = "ellama";
+      ename = "ellama";
+      version = "0.11.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ellama-0.11.9.tar";
+        sha256 = "0h41hsvz34v0gb9d7d8aw6phc7iyrpbs0r8djsz59yd0ijzbz12j";
+      };
+      packageRequires = [
+        compat
+        emacs
+        llm
+        spinner
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ellama.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emacs-gc-stats = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "emacs-gc-stats";
+      ename = "emacs-gc-stats";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar";
+        sha256 = "055ma32r92ksjnqy8xbzv0a79r7aap12h61dj860781fapfnifa3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  embark = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "embark";
+      ename = "embark";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/embark-1.1.tar";
+        sha256 = "074ggh7dkr5jdkwcndl6znhkq48jmc62rp7mc6vjidr6yxf8d1rn";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/embark.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  embark-consult = callPackage (
+    {
+      compat,
+      consult,
+      elpaBuild,
+      emacs,
+      embark,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "embark-consult";
+      ename = "embark-consult";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/embark-consult-1.1.tar";
+        sha256 = "06yh6w4zgvvkfllmcr0szsgjrfhh9rpjwgmcrf6h2gai2ps9xdqr";
+      };
+      packageRequires = [
+        compat
+        consult
+        emacs
+        embark
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/embark-consult.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ement = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      map,
+      persist,
+      plz,
+      svg-lib,
+      taxy,
+      taxy-magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "ement";
+      ename = "ement";
+      version = "0.15.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ement-0.15.1.tar";
+        sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld";
+      };
+      packageRequires = [
+        emacs
+        map
+        persist
+        plz
+        svg-lib
+        taxy
+        taxy-magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ement.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emms = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+      seq,
+    }:
+    elpaBuild {
+      pname = "emms";
+      ename = "emms";
+      version = "20.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/emms-20.1.tar";
+        sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/emms.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  engrave-faces = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "engrave-faces";
+      ename = "engrave-faces";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar";
+        sha256 = "0nl5wx61192dqd0191dvaszgjc7b2adrxsyc75f529fcyrfwgqfa";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/engrave-faces.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  enwc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "enwc";
+      ename = "enwc";
+      version = "2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/enwc-2.0.tar";
+        sha256 = "0y8154ykrashgg0bina5ambdrxw2qpimycvjldrk9d67hrccfh3m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/enwc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  epoch-view = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "epoch-view";
+      ename = "epoch-view";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el";
+        sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/epoch-view.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  erc = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "erc";
+      ename = "erc";
+      version = "5.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/erc-5.6.tar";
+        sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/erc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ergoemacs-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      undo-tree,
+    }:
+    elpaBuild {
+      pname = "ergoemacs-mode";
+      ename = "ergoemacs-mode";
+      version = "5.16.10.12";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.16.10.12.tar";
+        sha256 = "0s4lwb76c67npbcnvbxdawnj02zkc85sbm392lym1qccjmj9d02f";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        undo-tree
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ess = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ess";
+      ename = "ess";
+      version = "24.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ess-24.1.1.tar";
+        sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ess.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  excorporate = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      fsm,
+      lib,
+      nadvice,
+      soap-client,
+      url-http-ntlm,
+      url-http-oauth,
+    }:
+    elpaBuild {
+      pname = "excorporate";
+      ename = "excorporate";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/excorporate-1.1.2.tar";
+        sha256 = "111wvkn0ks7syfgf1cydq5s0kymha0j280xvnp09zcfbj706yhbw";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        fsm
+        nadvice
+        soap-client
+        url-http-ntlm
+        url-http-oauth
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/excorporate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  expand-region = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "expand-region";
+      ename = "expand-region";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar";
+        sha256 = "1rjx7w4gss8sbsjaljraa6cjpb57kdpx9zxmr30kbifb5lp511rd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/expand-region.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  expreg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "expreg";
+      ename = "expreg";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar";
+        sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/expreg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  external-completion = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "external-completion";
+      ename = "external-completion";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/external-completion-0.1.tar";
+        sha256 = "1bw2kvz7zf1s60d37j31krakryc1kpyial2idjy6ac6w7n1h0jzc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/external-completion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  exwm = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xelb,
+    }:
+    elpaBuild {
+      pname = "exwm";
+      ename = "exwm";
+      version = "0.31";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/exwm-0.31.tar";
+        sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq";
+      };
+      packageRequires = [
+        compat
+        emacs
+        xelb
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/exwm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  f90-interface-browser = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "f90-interface-browser";
+      ename = "f90-interface-browser";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el";
+        sha256 = "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  face-shift = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "face-shift";
+      ename = "face-shift";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/face-shift-0.2.1.tar";
+        sha256 = "14sbafkxr7kmv6sd5rw7d7hcsh0hhx92wkh6arfbchxad8jzimr6";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/face-shift.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  filechooser = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "filechooser";
+      ename = "filechooser";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar";
+        sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/filechooser.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  filladapt = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "filladapt";
+      ename = "filladapt";
+      version = "2.12.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/filladapt-2.12.2.tar";
+        sha256 = "0nmgw6v2krxn5palddqj1jzqxrajhpyq9v2x9lw12cdcldm9ab4k";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/filladapt.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  firefox-javascript-repl = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "firefox-javascript-repl";
+      ename = "firefox-javascript-repl";
+      version = "0.9.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/firefox-javascript-repl-0.9.5.tar";
+        sha256 = "07qmp6hfzgljrl9gkwy673xk67b3bgxq4kkw2kzr8ma4a7lx7a8l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flylisp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flylisp";
+      ename = "flylisp";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/flylisp-0.2.tar";
+        sha256 = "1agny4hc75xc8a9f339bynsazmxw8ccvyb03qx1d6nvwh9d7v1b9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flylisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake = callPackage (
+    {
+      eldoc,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "flymake";
+      ename = "flymake";
+      version = "1.3.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar";
+        sha256 = "15ikzdqyh77cgx94jaigfrrzfvwvpca8s2120gi82i9aaiypr7jl";
+      };
+      packageRequires = [
+        eldoc
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-codespell = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-codespell";
+      ename = "flymake-codespell";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar";
+        sha256 = "1x1bmdjmdaciknd702z54002bi1a5n51vvn9g7j6rnzjc1dxw97f";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-codespell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-proselint = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-proselint";
+      ename = "flymake-proselint";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar";
+        sha256 = "0bq7nc1qiqwxi848xy7wg1ig8k38nmq1w13xws10scjvndlbcjpl";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-proselint.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  fontaine = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "fontaine";
+      ename = "fontaine";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar";
+        sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/fontaine.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  frame-tabs = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "frame-tabs";
+      ename = "frame-tabs";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/frame-tabs-1.1.tar";
+        sha256 = "1a7hklir19inai68azgyfiw1bzq5z57kkp33lj6qbxxvfcqvw62w";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/frame-tabs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  frog-menu = callPackage (
+    {
+      avy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      posframe,
+    }:
+    elpaBuild {
+      pname = "frog-menu";
+      ename = "frog-menu";
+      version = "0.2.11";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.tar";
+        sha256 = "1iwyg9z8i03p9kkz6vhv00bzsqrsgl4xqqh08icial29c80q939l";
+      };
+      packageRequires = [
+        avy
+        emacs
+        posframe
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/frog-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  fsm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "fsm";
+      ename = "fsm";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/fsm-0.2.1.tar";
+        sha256 = "0kvm16077bn6bpbyw3k5935fhiq86ry2j1zcx9sj7dvb9w737qz4";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/fsm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ftable = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ftable";
+      ename = "ftable";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ftable-1.1.tar";
+        sha256 = "052vqw8892wv8lh5slm90gcvfk7ws5sgl1mzbdi4d3sy4kc4q48h";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ftable.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gcmh = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gcmh";
+      ename = "gcmh";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gcmh-0.2.1.tar";
+        sha256 = "030w493ilmc7w13jizwqsc33a424qjgicy1yxvlmy08yipnw3587";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gcmh.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ggtags = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ggtags";
+      ename = "ggtags";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar";
+        sha256 = "02gj8ghkk35clyscbvp1p1nlhmgm5h9g2cy4mavnfmx7jikmr4m3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ggtags.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gited = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gited";
+      ename = "gited";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gited-0.6.0.tar";
+        sha256 = "1s2h6y1adh28pvm3h5bivfja2nqnzm8w9sfza894pxf96kwk3pg2";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gited.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gle-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gle-mode";
+      ename = "gle-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gle-mode-1.1.tar";
+        sha256 = "12vbif4b4j87z7fg18dlcmzmbs2fp1g8bgsk5rch9h6dblg72prq";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gle-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnat-compiler = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "gnat-compiler";
+      ename = "gnat-compiler";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar";
+        sha256 = "1chydgswab2m81m3kbd31b1akyw4v1c9468wlfxpg2yydy8fc7vs";
+      };
+      packageRequires = [
+        emacs
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnat-compiler.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnome-c-style = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnome-c-style";
+      ename = "gnome-c-style";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
+        sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnome-c-style.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnorb = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnorb";
+      ename = "gnorb";
+      version = "1.6.11";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar";
+        sha256 = "1y0xpbifb8dm8hd5i9g8jph4jm76wviphszl5x3zi6w053jpss9b";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnorb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-elpa = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-elpa";
+      ename = "gnu-elpa";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar";
+        sha256 = "01cw1r5y86q1aardpvcwvwq161invrzxd0kv4qqi5agaff2nbp26";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnu-elpa.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-elpa-keyring-update = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-elpa-keyring-update";
+      ename = "gnu-elpa-keyring-update";
+      version = "2022.12.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.1.tar";
+        sha256 = "0yb81ly7y5262fpa0n96yngqmz1rgfwrpm0a6vqghdpr5x0c8z6n";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnugo = callPackage (
+    {
+      ascii-art-to-unicode,
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      xpm,
+    }:
+    elpaBuild {
+      pname = "gnugo";
+      ename = "gnugo";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnugo-3.1.2.tar";
+        sha256 = "0wingn5v4wa1xgsgmqqls28cifnff8mvm098kn8clw42mxr40257";
+      };
+      packageRequires = [
+        ascii-art-to-unicode
+        cl-lib
+        xpm
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnugo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnus-mock = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnus-mock";
+      ename = "gnus-mock";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar";
+        sha256 = "1yl624wzs4kw45zpnxh04dxn1kkpb6c2jl3i0sm1bijyhm303l4h";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gpastel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gpastel";
+      ename = "gpastel";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gpastel-0.5.0.tar";
+        sha256 = "12y1ysgnqjvsdp5gal90mp2wplif7rq1cj61393l6gf3pgv6jkzc";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gpastel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gpr-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      gnat-compiler,
+      lib,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "gpr-mode";
+      ename = "gpr-mode";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar";
+        sha256 = "1qdk2pkdxggfhj8gm39jb2b29g0gbw50vgil6rv3z0q7nlhpm2fp";
+      };
+      packageRequires = [
+        emacs
+        gnat-compiler
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gpr-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gpr-query = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      gnat-compiler,
+      lib,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "gpr-query";
+      ename = "gpr-query";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar";
+        sha256 = "1y283x549w544x37lmh25n19agyah2iz0b052hx8br4rnjdd9ii3";
+      };
+      packageRequires = [
+        emacs
+        gnat-compiler
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gpr-query.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  graphql = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "graphql";
+      ename = "graphql";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar";
+        sha256 = "1blpsj6sav3z9gj733cccdhpdnyvnvxp48z1hnjh0f0fl5avvkix";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/graphql.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  greader = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "greader";
+      ename = "greader";
+      version = "0.11.13";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/greader-0.11.13.tar";
+        sha256 = "0kyfws0b5dahf96b9wx06hmx0a0qsmywx6bay6xl6a5a4lchszsn";
+      };
+      packageRequires = [
+        compat
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/greader.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  greenbar = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "greenbar";
+      ename = "greenbar";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/greenbar-1.1.tar";
+        sha256 = "14azd170xq602fy4mcc770x5063rvpms8ilbzzn8kwyfvmijlbbx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/greenbar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gtags-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gtags-mode";
+      ename = "gtags-mode";
+      version = "1.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/gtags-mode-1.8.tar";
+        sha256 = "1rd0a3q45b5i46hi8snf25cyv65b7699ghbz8c6hrr4991h3ksll";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gtags-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  guess-language = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "guess-language";
+      ename = "guess-language";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el";
+        sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/guess-language.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hcel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hcel";
+      ename = "hcel";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar";
+        sha256 = "1pm3d0nz2mpf667jkjlmlidh203i4d4gk0n8xd3r66bzwc4l042b";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hcel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  heap = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "heap";
+      ename = "heap";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/heap-0.5.tar";
+        sha256 = "1q42v9mzmlhl4pr3wr94nsis7a9977f35w0qsyx2r982kwgmbndw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/heap.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hiddenquote = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hiddenquote";
+      ename = "hiddenquote";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar";
+        sha256 = "051aqiq77n487lnsxxwa8q0vyzk6m2fwi3l7xwvrl49p5xpia6zr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hiddenquote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  highlight-escape-sequences = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "highlight-escape-sequences";
+      ename = "highlight-escape-sequences";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.tar";
+        sha256 = "1gs662vvvzrqdlb1z73jf6wykjzs1jskcdksk8akqmply4sjvbpr";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hook-helpers = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hook-helpers";
+      ename = "hook-helpers";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar";
+        sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hook-helpers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  html5-schema = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "html5-schema";
+      ename = "html5-schema";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar";
+        sha256 = "018zvdjhdrkcy8yrsqqqikhl6drmqm1fs0y50m8q8vx42p0cyi1p";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/html5-schema.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hydra = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      lv,
+    }:
+    elpaBuild {
+      pname = "hydra";
+      ename = "hydra";
+      version = "0.15.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar";
+        sha256 = "082wdr2nsfz8jhh7ic4nq4labz0pq8lcdwnxdmw79ppm20p2jipk";
+      };
+      packageRequires = [
+        cl-lib
+        lv
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hydra.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hyperbole = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hyperbole";
+      ename = "hyperbole";
+      version = "9.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar";
+        sha256 = "0gjscqa0zagbymm6wfilvc8g68f8myv90ryd8kqfcpy81fh4dhiz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hyperbole.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  idlwave = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "idlwave";
+      ename = "idlwave";
+      version = "6.5.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/idlwave-6.5.1.tar";
+        sha256 = "0dd0dm92qyin8k4kgavrg82zwjhv6wsjq6gk55rzcspx0s8y2c24";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/idlwave.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ilist = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ilist";
+      ename = "ilist";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ilist-0.3.tar";
+        sha256 = "01a522sqx7j5m6b1k8xn71963igm93cd7ms1aawh1v2wmb09vbhm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ilist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inspector = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inspector";
+      ename = "inspector";
+      version = "0.36";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/inspector-0.36.tar";
+        sha256 = "0hbh4a71w4yxicn7v7v492i7iv0ncv5sxwwsbwknbl9ixm482h2z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/inspector.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ioccur = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ioccur";
+      ename = "ioccur";
+      version = "2.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ioccur-2.6.tar";
+        sha256 = "0xyx5xd46n5x078k7pv022h84xmxv7fkh31ddib872bmnirhk6ln";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ioccur.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  isearch-mb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "isearch-mb";
+      ename = "isearch-mb";
+      version = "0.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar";
+        sha256 = "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  iterators = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "iterators";
+      ename = "iterators";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/iterators-0.1.1.tar";
+        sha256 = "1xcqvj9dail1irvj2nbfx9x106mcav104pp89jz2diamrky6ja49";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/iterators.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy";
+      ename = "ivy";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar";
+        sha256 = "1h9gfkkcw9nfw85m0mh08qfmi2y0jkvdk54qx0iy5p04ysmhs6k1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-avy = callPackage (
+    {
+      avy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy-avy";
+      ename = "ivy-avy";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar";
+        sha256 = "12s5z3h8bpa6vdk7f54i2dy18hd3p782pq3x6mkclkvlxijv7d11";
+      };
+      packageRequires = [
+        avy
+        emacs
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-avy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-explorer = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy-explorer";
+      ename = "ivy-explorer";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.tar";
+        sha256 = "0wv7gp2kznc6f6g9ky1gvq72i78ihp582kyks82h13w25rvh6f0a";
+      };
+      packageRequires = [
+        emacs
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-explorer.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-hydra = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      hydra,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ivy-hydra";
+      ename = "ivy-hydra";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar";
+        sha256 = "1p08rpj3ac2rwjcqbzkq9r5pmc1d9ci7s9bl0qv5cj5r8wpl69mx";
+      };
+      packageRequires = [
+        emacs
+        hydra
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-hydra.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ivy-posframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+      posframe,
+    }:
+    elpaBuild {
+      pname = "ivy-posframe";
+      ename = "ivy-posframe";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar";
+        sha256 = "027lbddg4rc44jpvxsqyw9n9pi1bnsssfislg2il3hbr86v88va9";
+      };
+      packageRequires = [
+        emacs
+        ivy
+        posframe
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jami-bot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jami-bot";
+      ename = "jami-bot";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar";
+        sha256 = "1dp4k5y7qy793m3fyxvkk57bfy42kac2w5wvy7zqzd4lckm0a93z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jami-bot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jarchive = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jarchive";
+      ename = "jarchive";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar";
+        sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jarchive.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  javaimp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "javaimp";
+      ename = "javaimp";
+      version = "0.9.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar";
+        sha256 = "1gy7qys9mzpgbqm5798fncmblmi32b350q51ccsyydq67yh69s3z";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/javaimp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jgraph-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jgraph-mode";
+      ename = "jgraph-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.tar";
+        sha256 = "1ryxbszp15dy2chch2irqy7rmcspfjw717w4rd0vxjpwvgkjgiql";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jgraph-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jinx = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jinx";
+      ename = "jinx";
+      version = "1.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jinx-1.9.tar";
+        sha256 = "0k6km295y5w13kl18v9b6y0szdccf89nbar3zkdincy4iid5z6n1";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jinx.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jit-spell = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jit-spell";
+      ename = "jit-spell";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar";
+        sha256 = "0p9nf2n0x6c6xl32aczghzipx8n5aq7a1x6r2s78xvpwr299k998";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jit-spell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  js2-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "js2-mode";
+      ename = "js2-mode";
+      version = "20231224";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar";
+        sha256 = "023z76zxh5q6g26x7qlgf9476lj95sj84d5s3aqhy6xyskkyyg6c";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/js2-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  json-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "json-mode";
+      ename = "json-mode";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/json-mode-0.2.tar";
+        sha256 = "1ix8nq9rjfgbq8vzzjp179j2wa11il0ys8fjjy9gnlqwk6lnk86h";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/json-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jsonrpc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jsonrpc";
+      ename = "jsonrpc";
+      version = "1.0.25";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar";
+        sha256 = "18f0g8j1rd2fpa707w6fll6ryj7mg6hbcy2pc3xff2a4ps8zv12b";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jsonrpc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jumpc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jumpc";
+      ename = "jumpc";
+      version = "3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/jumpc-3.1.tar";
+        sha256 = "1c6wzwrr1ydpn5ah5xnk159xcn4v1gv5rjm4iyfj83dss2ygirzp";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jumpc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kind-icon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      svg-lib,
+    }:
+    elpaBuild {
+      pname = "kind-icon";
+      ename = "kind-icon";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar";
+        sha256 = "1zafx7rvfyahb7zzl2n9gpb2lc8x3k0bkcap2fl0n54aw4j98i69";
+      };
+      packageRequires = [
+        emacs
+        svg-lib
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kind-icon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kiwix = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      request,
+    }:
+    elpaBuild {
+      pname = "kiwix";
+      ename = "kiwix";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar";
+        sha256 = "1krmlyfjs8b7ibixbmv41vhg1gm7prck6lpp61v17fgig92a9k2s";
+      };
+      packageRequires = [
+        emacs
+        request
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kiwix.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kmb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "kmb";
+      ename = "kmb";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/kmb-0.1.tar";
+        sha256 = "12klfmdjjlyjvrzz3rx8dmamnag1fwljhs05jqwd0dv4a2q11gg5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kmb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  landmark = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "landmark";
+      ename = "landmark";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/landmark-1.0.tar";
+        sha256 = "1nnmnvyfjmkk5ddw4q24py1bqzykr29klip61n16bqpr39v56gpg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/landmark.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  latex-table-wizard = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "latex-table-wizard";
+      ename = "latex-table-wizard";
+      version = "1.5.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.4.tar";
+        sha256 = "1999kh5yi0cg1k0al3np3zi2qhrmcpzxqsfvwg0mgrg3mww4gqlw";
+      };
+      packageRequires = [
+        auctex
+        emacs
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  leaf = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "leaf";
+      ename = "leaf";
+      version = "4.5.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar";
+        sha256 = "1nvpl9ffma0ybbr7vlpcj7q33ja17zrswvl91bqljlmb4lb5121m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/leaf.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lentic = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      m-buffer,
+    }:
+    elpaBuild {
+      pname = "lentic";
+      ename = "lentic";
+      version = "0.12";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/lentic-0.12.tar";
+        sha256 = "0pszjhgy9dlk3h5gc8wnlklgl30ha3ig9bpmw2j1ps713vklfms7";
+      };
+      packageRequires = [
+        dash
+        emacs
+        m-buffer
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lentic.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lentic-server = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lentic,
+      lib,
+      web-server,
+    }:
+    elpaBuild {
+      pname = "lentic-server";
+      ename = "lentic-server";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/lentic-server-0.2.tar";
+        sha256 = "1r0jcfylvhlihwm6pm4f8pzvsmnlspfkph1hgi5qjkv311045244";
+      };
+      packageRequires = [
+        lentic
+        web-server
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lentic-server.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  let-alist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "let-alist";
+      ename = "let-alist";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/let-alist-1.0.6.tar";
+        sha256 = "1fk1yl2cg4gxcn02n2gki289dgi3lv56n0akkm2h7dhhbgfr6gqm";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/let-alist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lex = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lex";
+      ename = "lex";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/lex-1.2.tar";
+        sha256 = "1pqjrlw558l4z4k40jmli8lmcqlzddhkr0mfm38rbycp7ghdr4zx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lex.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lin = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lin";
+      ename = "lin";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/lin-1.0.0.tar";
+        sha256 = "1yxvpgh3sbw0d0zkjfgbhjc2bziqvkyj7fgwcl3814q7hh8m4146";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lin.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  listen = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      persist,
+      taxy,
+      taxy-magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "listen";
+      ename = "listen";
+      version = "0.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/listen-0.9.tar";
+        sha256 = "1g1sv8fs8vl93fah7liaqzgwvc4b1chasx5151ayizz4q2qgwwbp";
+      };
+      packageRequires = [
+        emacs
+        persist
+        taxy
+        taxy-magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/listen.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  literate-scratch = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "literate-scratch";
+      ename = "literate-scratch";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar";
+        sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  llm = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "llm";
+      ename = "llm";
+      version = "0.16.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/llm-0.16.1.tar";
+        sha256 = "1fqn4fdxhazpmlh8pf6ihnh132zjqrixry3kyymsmwang6vh2y7s";
+      };
+      packageRequires = [
+        emacs
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/llm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lmc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lmc";
+      ename = "lmc";
+      version = "1.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/lmc-1.4.tar";
+        sha256 = "0c8sd741a7imn1im4j17m99bs6zmppndsxpn23k33lmcqj1rfhsk";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lmc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  load-dir = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "load-dir";
+      ename = "load-dir";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/load-dir-0.0.5.tar";
+        sha256 = "1yxnckd7s4alkaddfs672g0jnsxir7c70crnm6rsc5vhmw6310nx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/load-dir.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  load-relative = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "load-relative";
+      ename = "load-relative";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar";
+        sha256 = "04ppqfzlqz7156aqm56yccizv0n71qir7yyp7xfiqq6vgj322rqv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/load-relative.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  loc-changes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "loc-changes";
+      ename = "loc-changes";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/loc-changes-1.2.el";
+        sha256 = "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/loc-changes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  loccur = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "loccur";
+      ename = "loccur";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar";
+        sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/loccur.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  logos = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "logos";
+      ename = "logos";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/logos-1.1.1.tar";
+        sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/logos.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  luwak = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "luwak";
+      ename = "luwak";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar";
+        sha256 = "0z6h1cg7nshv87zl4fia6l5gwf9ax6f4wgxijf2smi8cpwmv6j79";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/luwak.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lv = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lv";
+      ename = "lv";
+      version = "0.15.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/lv-0.15.0.tar";
+        sha256 = "1wb8whyj8zpsd7nm7r0yjvkfkr2ml80di7alcafpadzli808j2l4";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lv.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  m-buffer = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "m-buffer";
+      ename = "m-buffer";
+      version = "0.16";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar";
+        sha256 = "16drbgamp7yd1ndw2qrycrgmnknv5k7h4d7svcdhv9az6fg1vzn4";
+      };
+      packageRequires = [ seq ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/m-buffer.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  map = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "map";
+      ename = "map";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/map-3.3.1.tar";
+        sha256 = "1za8wjdvyxsxvmzla823f7z0s4wbl22l8k08v8b4h4m6i7w356lp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/map.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  marginalia = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "marginalia";
+      ename = "marginalia";
+      version = "1.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/marginalia-1.6.tar";
+        sha256 = "0an3ayka1f7n511bjfwz42h9g5b1vhb6x47jy0k9psscr7pbhszg";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/marginalia.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  markchars = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "markchars";
+      ename = "markchars";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/markchars-0.2.2.tar";
+        sha256 = "0jagp5s2kk8ijwxbg5ccq31bjlcxkqpqhsg7a1hbyp3p5z3j73m0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/markchars.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  math-symbol-lists = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "math-symbol-lists";
+      ename = "math-symbol-lists";
+      version = "1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar";
+        sha256 = "1r2acaf79kwwvndqn9xbvq9dc12vr3lryc25yp0w0gksp86p8cfa";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mct = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mct";
+      ename = "mct";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/mct-1.0.0.tar";
+        sha256 = "0f8znz4basrdh56pcldsazxv3mwqir807lsaza2g5bfqws0c7h8k";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mct.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  memory-usage = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "memory-usage";
+      ename = "memory-usage";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/memory-usage-0.2.tar";
+        sha256 = "04bylvy86x8w96g7zil3jzyac0fijvb5lz4830ja5yabpvsnk3vq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/memory-usage.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  metar = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "metar";
+      ename = "metar";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/metar-0.3.tar";
+        sha256 = "07nf14zm5y6ma6wqnyw5bf7cvk3ybw7hvlrwcnri10s8vh3rqd0r";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/metar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  midi-kbd = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "midi-kbd";
+      ename = "midi-kbd";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/midi-kbd-0.2.tar";
+        sha256 = "0jd92rainjd1nx72z7mrvsxs3az6axxiw1v9sbpsj03x8qq0129q";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/midi-kbd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mines = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mines";
+      ename = "mines";
+      version = "1.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/mines-1.6.tar";
+        sha256 = "0j52n43mv963hpgdh5kk1k9wi821r6w3diwdp47rfwsijdd0wnhs";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mines.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minibuffer-header = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minibuffer-header";
+      ename = "minibuffer-header";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar";
+        sha256 = "1qic33wsdba5xw3qxigq18nibwhj45ggk0ragy4zj9cfy1l2ni44";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minibuffer-line = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minibuffer-line";
+      ename = "minibuffer-line";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.tar";
+        sha256 = "0sg9vhv7bi82a90ziiwsabnfvw8zp544v0l93hbl42cj432bpwfx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minibuffer-line.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minimap = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minimap";
+      ename = "minimap";
+      version = "1.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/minimap-1.4.tar";
+        sha256 = "0n27wp65x5n21qy6x5dhzms8inf0248kzninp56kfx1bbf9w4x66";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minimap.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mmm-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mmm-mode";
+      ename = "mmm-mode";
+      version = "0.5.11";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar";
+        sha256 = "0dh76lk0am07j2zi7hhbmr6cnnss7l0b9rhi9is0w0n5i7j4i0p2";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  modus-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "modus-themes";
+      ename = "modus-themes";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar";
+        sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/modus-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mpdired = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mpdired";
+      ename = "mpdired";
+      version = "2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/mpdired-2.tar";
+        sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mpdired.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  multi-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "multi-mode";
+      ename = "multi-mode";
+      version = "1.14";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/multi-mode-1.14.tar";
+        sha256 = "0i2l50lcsj3mm9k38kfmh2hnb437pjbk2yxv26p6na1g1n44lkil";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/multi-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  multishell = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "multishell";
+      ename = "multishell";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar";
+        sha256 = "1khqc7a04ynl63lpv898361sv37jgpd1fzvl0ryphprv9shnhw10";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/multishell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  muse = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "muse";
+      ename = "muse";
+      version = "3.20.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/muse-3.20.2.tar";
+        sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/muse.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  myers = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "myers";
+      ename = "myers";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/myers-0.1.tar";
+        sha256 = "0a053w7nj0qfryvsh1ss854wxwbk5mhkl8a5nprcfgsh4qh2m487";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/myers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nadvice = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nadvice";
+      ename = "nadvice";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nadvice-0.4.tar";
+        sha256 = "19dx07v4z2lyyp18v45c5hgp65akw58bdqg5lcrzyb9mrlji8js6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nadvice.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nameless = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nameless";
+      ename = "nameless";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nameless-1.0.2.tar";
+        sha256 = "0m3z701j2i13zmr4g0wjd3ms6ajr6w371n5kx95n9ssxyjwjppcm";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nameless.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  names = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "names";
+      ename = "names";
+      version = "20151201.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/names-20151201.0.tar";
+        sha256 = "0nf6n8hk58a7r56d899s5dsva3jjvh3qx9g2d1hra403fwlds74k";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/names.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nano-agenda = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nano-agenda";
+      ename = "nano-agenda";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar";
+        sha256 = "12sh6wqqd13sv966wj4k4djidn238fdb6l4wg3z9ib0dx36nygcr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nano-agenda.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nano-modeline = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nano-modeline";
+      ename = "nano-modeline";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar";
+        sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nano-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nano-theme";
+      ename = "nano-theme";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar";
+        sha256 = "0x49lk0kx8mz72a81li6gwg3kivn7bn4ld0mml28smzqqfr3873a";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nano-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nftables-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nftables-mode";
+      ename = "nftables-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar";
+        sha256 = "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nftables-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nhexl-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nhexl-mode";
+      ename = "nhexl-mode";
+      version = "1.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.tar";
+        sha256 = "1i1by5bp5dby2r2jhzr0jvnchrybgnzmc5ln84w66180shk2s3yk";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nhexl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nlinum = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nlinum";
+      ename = "nlinum";
+      version = "1.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/nlinum-1.9.tar";
+        sha256 = "1cpyg6cxaaaaq6hc066l759dlas5mhn1fi398myfglnwrglia3lm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nlinum.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  notes-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "notes-mode";
+      ename = "notes-mode";
+      version = "1.31";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/notes-mode-1.31.tar";
+        sha256 = "0lwja53cknd1w432mcbfrcshmxmk23dqrbr9k2101pqfzbw8nri2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/notes-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  notmuch-indicator = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "notmuch-indicator";
+      ename = "notmuch-indicator";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar";
+        sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ntlm = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ntlm";
+      ename = "ntlm";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ntlm-2.1.0.tar";
+        sha256 = "0kivmb6b57qjrwd41zwlfdq7l9nisbh4mgd96rplrkxpzw6dq0j7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ntlm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  num3-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "num3-mode";
+      ename = "num3-mode";
+      version = "1.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar";
+        sha256 = "1a7w2qd210zp199c1js639xbv2kmqmgvcqi5dn1vsazasp2dwlj2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/num3-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  oauth2 = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "oauth2";
+      ename = "oauth2";
+      version = "0.16";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/oauth2-0.16.tar";
+        sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/oauth2.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ob-asymptote = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ob-asymptote";
+      ename = "ob-asymptote";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar";
+        sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ob-asymptote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ob-haxe = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ob-haxe";
+      ename = "ob-haxe";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar";
+        sha256 = "095qcvxpanw6fh96dfkdydn10xikbrjwih7i05iiyvazpk4x6nbz";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ob-haxe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  objed = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "objed";
+      ename = "objed";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/objed-0.8.3.tar";
+        sha256 = "1shgpha6f1pql95v86whsw6w6j7v35cas98fyygwrpkcrxx9a56r";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/objed.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  omn-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "omn-mode";
+      ename = "omn-mode";
+      version = "1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/omn-mode-1.3.tar";
+        sha256 = "01yg4ifbz7jfhvq6r6naf50vx00wpjsr44mmlj580bylfrmdc839";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/omn-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  on-screen = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "on-screen";
+      ename = "on-screen";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/on-screen-1.3.3.tar";
+        sha256 = "0w5cv3bhb6cyjhvglp5y6cy51ppsh2xd1x53i4w0gm44g5n8l6bd";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/on-screen.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  openpgp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "openpgp";
+      ename = "openpgp";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/openpgp-1.0.1.tar";
+        sha256 = "052wh38q6r09avxa0bgc5gn4769763zmgijza76mb0b3lzj66syv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/openpgp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  orderless = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "orderless";
+      ename = "orderless";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/orderless-1.1.tar";
+        sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/orderless.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org";
+      ename = "org";
+      version = "9.7.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-9.7.6.tar";
+        sha256 = "0pxjc2bydnzd31wg71nfh7zzf3mhsnzm2nd7p736bj1w0pvg89ng";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-contacts = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-contacts";
+      ename = "org-contacts";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar";
+        sha256 = "0gqanhnrxajx5cf7g9waks23sclbmvmwjqrs0q4frcih3gs2nhix";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-contacts.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-edna = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+      seq,
+    }:
+    elpaBuild {
+      pname = "org-edna";
+      ename = "org-edna";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar";
+        sha256 = "1pifs5mbcjab21ylclck4kjdcds1xkvym27ncn9wwr8fl3fff2yl";
+      };
+      packageRequires = [
+        emacs
+        org
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-edna.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-jami-bot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      jami-bot,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-jami-bot";
+      ename = "org-jami-bot";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar";
+        sha256 = "1fiv0a7k6alvfvb7c6av0kbkwbw58plw05hhcf1vnkr9gda3s13y";
+      };
+      packageRequires = [
+        emacs
+        jami-bot
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-modern = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-modern";
+      ename = "org-modern";
+      version = "1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-modern-1.3.tar";
+        sha256 = "1lpl9q9ijyp6pwb0qap9ydzkq0pd5xkbfpaqy1nvcy5b906jmkdj";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-modern.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-notify = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-notify";
+      ename = "org-notify";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar";
+        sha256 = "1vg0h32x5lc3p5n71m23q8mfdd1fq9ffmy9rsm5rcdphfk8s9x5l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-notify.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-real = callPackage (
+    {
+      boxy,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-real";
+      ename = "org-real";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar";
+        sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2";
+      };
+      packageRequires = [
+        boxy
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-real.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-remark = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-remark";
+      ename = "org-remark";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar";
+        sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-remark.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-transclusion = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-transclusion";
+      ename = "org-transclusion";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar";
+        sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-transclusion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-translate = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-translate";
+      ename = "org-translate";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar";
+        sha256 = "0s0vqpncb6rvhpxdir5ghanjyhpw7bplqfh3bpgri5ay2b46kj4f";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-translate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  orgalist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "orgalist";
+      ename = "orgalist";
+      version = "1.16";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/orgalist-1.16.tar";
+        sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/orgalist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  osc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "osc";
+      ename = "osc";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/osc-0.4.tar";
+        sha256 = "1ls6v0mkh7z90amrlczrvv6mgpv6hzzjw0zlxjlzsj2vr1gz3vca";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/osc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  osm = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "osm";
+      ename = "osm";
+      version = "1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/osm-1.3.tar";
+        sha256 = "0s5k6akdvbm9gsgzjlz795vgfy3pkl4qdk45p16p40f59dr49g4r";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/osm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  other-frame-window = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "other-frame-window";
+      ename = "other-frame-window";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.tar";
+        sha256 = "1x8i6hbl48vmp5h43drr35lwaiwhcyr3vnk7rcyim5jl2ijw8yc0";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/other-frame-window.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pabbrev = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pabbrev";
+      ename = "pabbrev";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar";
+        sha256 = "1fplbmzqz066gsmvmf2indg4n348vdgs2m34dm32gnrjghfrxxhs";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pabbrev.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  paced = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "paced";
+      ename = "paced";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/paced-1.1.3.tar";
+        sha256 = "0j2362zq22j6qma6bb6jh6qpd12zrc161pgl9cfhnq5m3s9i1sz4";
+      };
+      packageRequires = [
+        async
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/paced.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parsec = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "parsec";
+      ename = "parsec";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar";
+        sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/parsec.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parser-generator = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "parser-generator";
+      ename = "parser-generator";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar";
+        sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/parser-generator.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  path-iterator = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "path-iterator";
+      ename = "path-iterator";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar";
+        sha256 = "0v9gasc0wlqd7pks6k3695md7mdfnaknh6xinmp4pkvvalfh7shv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/path-iterator.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  peg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "peg";
+      ename = "peg";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/peg-1.0.1.tar";
+        sha256 = "14ll56fn9n11nydydslp7xyn79122dprm89i181ks170v0qcsps3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/peg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  perl-doc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "perl-doc";
+      ename = "perl-doc";
+      version = "0.81";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar";
+        sha256 = "1828jfl5dwk1751jsrpr2gr8hs1x315xlb9vhiis8frzvqmsribw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/perl-doc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  persist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "persist";
+      ename = "persist";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/persist-0.6.1.tar";
+        sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/persist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  phps-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "phps-mode";
+      ename = "phps-mode";
+      version = "0.4.49";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/phps-mode-0.4.49.tar";
+        sha256 = "1zxzv6h2075s0ldwr9izfy3sxrrg3x5y5vilnlgnwd7prcq8qa8y";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/phps-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pinentry = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pinentry";
+      ename = "pinentry";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pinentry-0.1.tar";
+        sha256 = "0i5g4yj2qva3rp8ay2fl9gcmp7q42caqryjyni8r5h4f3misviwq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pinentry.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "plz";
+      ename = "plz";
+      version = "0.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/plz-0.9.tar";
+        sha256 = "1wgcfwrmbw6bl00midhn99hn3fvbavkibb4r6s99yzmd48vyapr8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  plz-see = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+    }:
+    elpaBuild {
+      pname = "plz-see";
+      ename = "plz-see";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/plz-see-0.1.tar";
+        sha256 = "1mi35d9b26d425v1kkmmbh477klcxf76fnyg154ddjm0nkgqq90d";
+      };
+      packageRequires = [
+        emacs
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/plz-see.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  poke = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "poke";
+      ename = "poke";
+      version = "3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/poke-3.2.tar";
+        sha256 = "15j4g5y427d9mja2irv3ak6x60ik4kpnscnwl9pqym7qly7sa3v9";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/poke.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  poke-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "poke-mode";
+      ename = "poke-mode";
+      version = "3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar";
+        sha256 = "0g4vd26ahkmjxlcvqwd0mbk60qaf6c9zba9x7bb9pqabka9438y1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/poke-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  poker = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "poker";
+      ename = "poker";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/poker-0.2.tar";
+        sha256 = "10lfc6i4f08ydxanidwiq9404h4nxfa0vh4av5rrj6snqzqvd1bw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/poker.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  popper = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "popper";
+      ename = "popper";
+      version = "0.4.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/popper-0.4.6.tar";
+        sha256 = "0xwy4p9g0lfd4ybamsl5gsppmx79yv16s4lh095x5y5qfmgcvq2c";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/popper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  posframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "posframe";
+      ename = "posframe";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar";
+        sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/posframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pq = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pq";
+      ename = "pq";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pq-0.2.tar";
+        sha256 = "0d8ylsbmypaj29w674a4k445zr6hnggic8rsv7wx7jml6p2zph2n";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pq.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  preview-auto = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "preview-auto";
+      ename = "preview-auto";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar";
+        sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/preview-auto.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  preview-tailor = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "preview-tailor";
+      ename = "preview-tailor";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/preview-tailor-0.2.tar";
+        sha256 = "1mqh2myz5w84f4n01ibd695h4mnqwjxmg7rvs7pz3sylz1xqyks7";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  project = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xref,
+    }:
+    elpaBuild {
+      pname = "project";
+      ename = "project";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/project-0.11.1.tar";
+        sha256 = "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0";
+      };
+      packageRequires = [
+        emacs
+        xref
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/project.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  psgml = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "psgml";
+      ename = "psgml";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar";
+        sha256 = "1lfk95kr43az6ykfyhj7ygccw3ms2ifyyp43w9lwm5fcawgc8952";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/psgml.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pspp-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pspp-mode";
+      ename = "pspp-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el";
+        sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pulsar = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pulsar";
+      ename = "pulsar";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar";
+        sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pulsar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pyim = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xr,
+    }:
+    elpaBuild {
+      pname = "pyim";
+      ename = "pyim";
+      version = "5.3.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pyim-5.3.4.tar";
+        sha256 = "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs";
+      };
+      packageRequires = [
+        async
+        emacs
+        xr
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pyim.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pyim-basedict = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pyim-basedict";
+      ename = "pyim-basedict";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar";
+        sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  python = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "python";
+      ename = "python";
+      version = "0.28";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/python-0.28.tar";
+        sha256 = "042jhg87bnc750wwjwvp32ici3pyswx1pza2qz014ykdqqnsx0aq";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/python.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  quarter-plane = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "quarter-plane";
+      ename = "quarter-plane";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/quarter-plane-0.1.tar";
+        sha256 = "06syayqdmh4nb7ys52g1mw01wnz5hjv710dari106fk8fm9cy18c";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/quarter-plane.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  queue = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "queue";
+      ename = "queue";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/queue-0.2.tar";
+        sha256 = "117g6sl5dh7ssp6m18npvrqik5rs2mnr16129cfpnbi3crsw23c8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/queue.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rainbow-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rainbow-mode";
+      ename = "rainbow-mode";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar";
+        sha256 = "0xv39jix1gbwq6f8laj93sqkf2j5hwda3l7mjqc7vsqjw1lkhmjv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rainbow-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rbit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rbit";
+      ename = "rbit";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rbit-0.1.tar";
+        sha256 = "1xfl3m53bdi25h8mp7s0zp1yy7436cfydxrgkfc31fsxkh009l9h";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rbit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rcirc-color = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rcirc-color";
+      ename = "rcirc-color";
+      version = "0.4.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar";
+        sha256 = "0sfwmi0sspj7sx1psij4fzq1knwva8706w0204mbjxsq2nh5s9f3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rcirc-menu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rcirc-menu";
+      ename = "rcirc-menu";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el";
+        sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rcirc-sqlite = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rcirc-sqlite";
+      ename = "rcirc-sqlite";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar";
+        sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      loc-changes,
+      test-simple,
+    }:
+    elpaBuild {
+      pname = "realgud";
+      ename = "realgud";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar";
+        sha256 = "1iisvzxvdsifxkz7b2wacw85dkjagrmbcdhcfsnswnfbp3r3kg35";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        loc-changes
+        test-simple
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-ipdb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-ipdb";
+      ename = "realgud-ipdb";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar";
+        sha256 = "0zmgsrb15rmgszidx4arjazb6fz523q5w516z5k5cn92wfzfyncr";
+      };
+      packageRequires = [
+        emacs
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-jdb = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-jdb";
+      ename = "realgud-jdb";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar";
+        sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-jdb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-lldb = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-lldb";
+      ename = "realgud-lldb";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar";
+        sha256 = "1g4spjrldyi9rrh5dwrcqpz5qm37fq2qpvmirxvdqgfbwl6gapzj";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-lldb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-node-debug = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-node-debug";
+      ename = "realgud-node-debug";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar";
+        sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-node-inspect = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-node-inspect";
+      ename = "realgud-node-inspect";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar";
+        sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-trepan-ni = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-trepan-ni";
+      ename = "realgud-trepan-ni";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar";
+        sha256 = "09vllklpfc0q28ankp2s1v10kwnxab4g6hb9zn63d1rfa92qy44k";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  realgud-trepan-xpy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      load-relative,
+      realgud,
+    }:
+    elpaBuild {
+      pname = "realgud-trepan-xpy";
+      ename = "realgud-trepan-xpy";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/realgud-trepan-xpy-1.0.1.tar";
+        sha256 = "13fll0c6p2idg56q0czgv6s00vvb585b40dn3b14hdpy0givrc0x";
+      };
+      packageRequires = [
+        emacs
+        load-relative
+        realgud
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rec-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rec-mode";
+      ename = "rec-mode";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar";
+        sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rec-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  register-list = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "register-list";
+      ename = "register-list";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/register-list-0.1.tar";
+        sha256 = "01w2yyvbmnkjrmx5f0dk0327c0k7fvmgi928j6hbvlrp5wk6s394";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/register-list.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  relint = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      xr,
+    }:
+    elpaBuild {
+      pname = "relint";
+      ename = "relint";
+      version = "1.24";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/relint-1.24.tar";
+        sha256 = "0pnv2pkx5jq30049zplrmspkm1cc7p6vy9xfv215d27v8nas0374";
+      };
+      packageRequires = [
+        emacs
+        xr
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/relint.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  repology = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "repology";
+      ename = "repology";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/repology-1.2.4.tar";
+        sha256 = "0nj4dih9mv8crqq8rd4k8dzgq7l0195syfxsf2gyikmqz9sjbr85";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/repology.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rich-minority = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rich-minority";
+      ename = "rich-minority";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar";
+        sha256 = "0npk6gnr2m4mfv40y2m265lxk1dyn8fd6d90vs3j2xrhpybgbln2";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rich-minority.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rnc-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rnc-mode";
+      ename = "rnc-mode";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar";
+        sha256 = "1p03g451888v86k9z6g8gj375p1pcdvikgk1phxkhipwi5hbf5g8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rnc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rt-liberation = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rt-liberation";
+      ename = "rt-liberation";
+      version = "7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rt-liberation-7.tar";
+        sha256 = "0bi1qyc4n4ar0rblnddmlrlrkdvdrvv54wg4ii39hhxij4p6niif";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ruby-end = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ruby-end";
+      ename = "ruby-end";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar";
+        sha256 = "07175v9fy96lmkfa0007lhx7v3fkk77iwca3rjl94dgdp4b8lbk5";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ruby-end.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rudel = callPackage (
+    {
+      cl-generic,
+      cl-lib ? null,
+      cl-print ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rudel";
+      ename = "rudel";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar";
+        sha256 = "00rs2fy64ybam26szpc93miwajq42acyh0dkg0ixr95mg49sc46j";
+      };
+      packageRequires = [
+        cl-generic
+        cl-lib
+        cl-print
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rudel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  satchel = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "satchel";
+      ename = "satchel";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/satchel-0.2.tar";
+        sha256 = "115rkq2ygawsg8ph44zfqwsd9ykm4370v0whgjwhc1wx2iyn5ir9";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/satchel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scanner = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scanner";
+      ename = "scanner";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/scanner-0.2.tar";
+        sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scanner.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scroll-restore = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scroll-restore";
+      ename = "scroll-restore";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/scroll-restore-1.0.tar";
+        sha256 = "1i9ld1l5h2cpzf8bzk7nlk2bcln48gya8zrq79v6rawbrwdlz2z4";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scroll-restore.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sed-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sed-mode";
+      ename = "sed-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar";
+        sha256 = "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sed-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  seq = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "seq";
+      ename = "seq";
+      version = "2.24";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/seq-2.24.tar";
+        sha256 = "13x8l1m5if6jpc8sbrbx9r64fyhh450ml6vfm92p6i5wv6gl74w6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/seq.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  setup = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "setup";
+      ename = "setup";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/setup-1.4.0.tar";
+        sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/setup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shelisp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shelisp";
+      ename = "shelisp";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar";
+        sha256 = "0zhkk04nj25lmpdlqblfhx3rb415w2f58f7wb19k1s2ry4k7m15g";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shelisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shell-command-plus = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shell-command-plus";
+      ename = "shell-command+";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
+        sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shell-command+.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shen-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shen-mode";
+      ename = "shen-mode";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar";
+        sha256 = "0xskyd0d3krwgrpca10m7l7c0l60qq7jjn2q207n61yw5yx71pqn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shen-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sisu-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sisu-mode";
+      ename = "sisu-mode";
+      version = "7.1.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.tar";
+        sha256 = "02cfyrjynwvf2rlnkfy8285ga9kzbg1b614sch0xnxqw81mp7drp";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sisu-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  site-lisp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "site-lisp";
+      ename = "site-lisp";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar";
+        sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/site-lisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sketch-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sketch-mode";
+      ename = "sketch-mode";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar";
+        sha256 = "1vrbmyhf9bffy2fkz91apzxla6v8nbv2wb25vxcr9x3smbag9kal";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sketch-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  slime-volleyball = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "slime-volleyball";
+      ename = "slime-volleyball";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar";
+        sha256 = "1qlmsxnhja8p873rvb1qj4xsf938bs3hl8qqqsmrm0csvlb9737p";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sm-c-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sm-c-mode";
+      ename = "sm-c-mode";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sm-c-mode-1.2.tar";
+        sha256 = "0xykl8wkbw5y7ah79zlfzz1k0di9ghfsv2xjxwx7rrb37wny5184";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sm-c-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  smalltalk-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "smalltalk-mode";
+      ename = "smalltalk-mode";
+      version = "4.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar";
+        sha256 = "0ly2qmsbmzd5nd7iaighws10y0yj7p2356fw32pkp0cmzzvc3d54";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  smart-yank = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "smart-yank";
+      ename = "smart-yank";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.tar";
+        sha256 = "08dc4c60jcjyiixyzckxk5qk6s2pl1jmrp4h1bj53ssd1kn4208m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/smart-yank.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sml-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sml-mode";
+      ename = "sml-mode";
+      version = "6.12";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar";
+        sha256 = "10zp0gi5rbjjxjzn9k6klvdms9k3yxx0qry0wa75a68sj5x2rdzh";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sml-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  so-long = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "so-long";
+      ename = "so-long";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar";
+        sha256 = "01qdxlsllpj5ajixkqf7v9p95zn9qnvjdnp30v54ymj2pd0d9a32";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/so-long.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  soap-client = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "soap-client";
+      ename = "soap-client";
+      version = "3.2.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/soap-client-3.2.3.tar";
+        sha256 = "1yhs661g0vqxpxqcxgsxvljmrpcqzl0y52lz6jvfilmshw7r6k2s";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/soap-client.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sokoban = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sokoban";
+      ename = "sokoban";
+      version = "1.4.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar";
+        sha256 = "1l3d4al96252kdhyn4dr88ir67kay57n985w0qy8p930ncrs846v";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sokoban.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sotlisp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sotlisp";
+      ename = "sotlisp";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.tar";
+        sha256 = "0q65iwr89cwwqnc1kndf2agq5wp48a7k02qsksgaj0n6zv7i4dfn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sotlisp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spacious-padding = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spacious-padding";
+      ename = "spacious-padding";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar";
+        sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/spacious-padding.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spinner = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spinner";
+      ename = "spinner";
+      version = "1.7.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar";
+        sha256 = "0lq8q62q5an8199p8pyafg5l6hdnnqi6i6sybnk60sdcqy62pa6r";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/spinner.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-beeline = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-beeline";
+      ename = "sql-beeline";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar";
+        sha256 = "0ngvvfhs1fj3ca5g563bssaz9ac5fiqkqzv09s4ramalp2q6axq9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-cassandra = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-cassandra";
+      ename = "sql-cassandra";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar";
+        sha256 = "154rymq0k6869cw7sc7nhx3di5qv1ffgf8shkxc22gvkrj2s7p9b";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-cassandra.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sql-indent = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sql-indent";
+      ename = "sql-indent";
+      version = "1.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar";
+        sha256 = "1yfb01wh5drgvrwbn0hgzyi0rc4zlr1w23d065x4qrld31jbka8i";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sql-indent.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  srht = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      plz,
+      transient,
+    }:
+    elpaBuild {
+      pname = "srht";
+      ename = "srht";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/srht-0.4.tar";
+        sha256 = "0ps49syzlaf4lxvji61y6y7r383r65v96d57hj75xkn6hvyrz74n";
+      };
+      packageRequires = [
+        emacs
+        plz
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/srht.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ssh-deploy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ssh-deploy";
+      ename = "ssh-deploy";
+      version = "3.1.16";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar";
+        sha256 = "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  standard-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "standard-themes";
+      ename = "standard-themes";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/standard-themes-2.0.1.tar";
+        sha256 = "0cyr3n9w359sa8ylcgzsvhxrk9f1rl1scb5339ci2la7zpg5vxwr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/standard-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  stream = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "stream";
+      ename = "stream";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/stream-2.3.0.tar";
+        sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/stream.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  substitute = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "substitute";
+      ename = "substitute";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar";
+        sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/substitute.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "svg";
+      ename = "svg";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/svg-1.1.tar";
+        sha256 = "10x2rry349ibzd9awy4rg18cd376yvkzqsyq0fm4i05kq4dzqp4a";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg-clock = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      svg,
+    }:
+    elpaBuild {
+      pname = "svg-clock";
+      ename = "svg-clock";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/svg-clock-1.2.tar";
+        sha256 = "0r0wayb1q0dd2yi1nqa0m4jfy36lydxxa6xvvd6amgh9sy499qs8";
+      };
+      packageRequires = [
+        emacs
+        svg
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg-clock.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg-lib = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "svg-lib";
+      ename = "svg-lib";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar";
+        sha256 = "1s7n3j1yzprs9frb554c66pcrv3zss1y26y6qgndii4bbzpa7jh8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg-lib.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  svg-tag-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      svg-lib,
+    }:
+    elpaBuild {
+      pname = "svg-tag-mode";
+      ename = "svg-tag-mode";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar";
+        sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr";
+      };
+      packageRequires = [
+        emacs
+        svg-lib
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  swiper = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      ivy,
+      lib,
+    }:
+    elpaBuild {
+      pname = "swiper";
+      ename = "swiper";
+      version = "0.14.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar";
+        sha256 = "1rzp78ix19ddm7fx7p4i5iybd5lw244kqvf3nrafz3r7q6hi8yds";
+      };
+      packageRequires = [
+        emacs
+        ivy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/swiper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  switchy-window = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "switchy-window";
+      ename = "switchy-window";
+      version = "1.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar";
+        sha256 = "0ym5cy6czsrd15f8rgh3dad8fwn8pb2xrvhlmdikc59cc29zamrv";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/switchy-window.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sxhkdrc-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sxhkdrc-mode";
+      ename = "sxhkdrc-mode";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar";
+        sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  system-packages = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "system-packages";
+      ename = "system-packages";
+      version = "1.0.13";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar";
+        sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/system-packages.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tNFA = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "tNFA";
+      ename = "tNFA";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el";
+        sha256 = "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds";
+      };
+      packageRequires = [ queue ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tNFA.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tam = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "tam";
+      ename = "tam";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tam-0.1.tar";
+        sha256 = "16ms55cwm2cwixl03a3bbsqs159c3r3dv5kaazvsghby6c511bx8";
+      };
+      packageRequires = [
+        emacs
+        queue
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tam.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  taxy = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "taxy";
+      ename = "taxy";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar";
+        sha256 = "0r4kv0lqjk720p8kfah256370miqg68598jp5466sc6v9qax4wd9";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/taxy.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  taxy-magit-section = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      magit-section,
+      taxy,
+    }:
+    elpaBuild {
+      pname = "taxy-magit-section";
+      ename = "taxy-magit-section";
+      version = "0.13";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/taxy-magit-section-0.13.tar";
+        sha256 = "06sivl4rc06qr67qw2gqpw7lsaqf3j78llkrljwby7a77yzlhbrj";
+      };
+      packageRequires = [
+        emacs
+        magit-section
+        taxy
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  temp-buffer-browse = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "temp-buffer-browse";
+      ename = "temp-buffer-browse";
+      version = "1.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.tar";
+        sha256 = "00hbh25fj5fm9dsp8fpdk8lap3gi5jlva6f0m6kvjqnmvc06q36r";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tempel = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tempel";
+      ename = "tempel";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tempel-1.1.tar";
+        sha256 = "01zrp3wi4nvp67wda1b5fyjfxd0akhk7aqc2nqh1sk4mjp5zpnsq";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tempel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  test-simple = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "test-simple";
+      ename = "test-simple";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/test-simple-1.3.0.tar";
+        sha256 = "065jfps5ixpy5d4l2xgwhkpafdwiziqh4msbjcascwpac3j5c5yp";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/test-simple.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tex-item = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tex-item";
+      ename = "tex-item";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tex-item-0.1.tar";
+        sha256 = "0ggbn3lk64cv6pnw97ww7vn250jchj80zx3hvkcqlccyw34x6ziy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tex-item.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tex-parens = callPackage (
+    {
+      auctex,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tex-parens";
+      ename = "tex-parens";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar";
+        sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd";
+      };
+      packageRequires = [
+        auctex
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tex-parens.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  theme-buffet = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "theme-buffet";
+      ename = "theme-buffet";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar";
+        sha256 = "1cfrrl41rlxdbybvxs8glkgmgkznwgpq70h58rkvwm6b5jfs8wv0";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/theme-buffet.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  timerfunctions = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "timerfunctions";
+      ename = "timerfunctions";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
+        sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tiny = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tiny";
+      ename = "tiny";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar";
+        sha256 = "1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tiny.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tmr = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tmr";
+      ename = "tmr";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar";
+        sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tmr.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tomelr = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      map,
+      seq,
+    }:
+    elpaBuild {
+      pname = "tomelr";
+      ename = "tomelr";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar";
+        sha256 = "0r2f4dl10fl75ygvbmb4vkqixy24k0z2wpr431ljzp5m29bn74kh";
+      };
+      packageRequires = [
+        emacs
+        map
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tomelr.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  topspace = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "topspace";
+      ename = "topspace";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar";
+        sha256 = "0m8z2q1gdi0zfh1df5xb2v0sg1v5fysrl00fv2qqgnd61c2n0hhz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/topspace.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  track-changes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "track-changes";
+      ename = "track-changes";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/track-changes-1.2.tar";
+        sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/track-changes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tramp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tramp";
+      ename = "tramp";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tramp-2.7.1.tar";
+        sha256 = "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tramp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tramp-nspawn = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tramp-nspawn";
+      ename = "tramp-nspawn";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar";
+        sha256 = "0cy8l389s6pi135gxcygv1vna6k3gizqd33avf3wsdbnqdf2pjnc";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tramp-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tramp-theme";
+      ename = "tramp-theme";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar";
+        sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tramp-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  transcribe = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "transcribe";
+      ename = "transcribe";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/transcribe-1.5.2.tar";
+        sha256 = "1v1bvcv3zqrj073l3vw7gz20rpa9p86rf1yv219n47kmh27c80hq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/transcribe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  transient = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "transient";
+      ename = "transient";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/transient-0.7.2.tar";
+        sha256 = "0i68wpwxf729qxjxhafkp098wcmkqn06ka3hcqnlky2p1zl29hby";
+      };
+      packageRequires = [
+        compat
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/transient.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  transient-cycles = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "transient-cycles";
+      ename = "transient-cycles";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar";
+        sha256 = "0s6cxagqxj4i3qf4kx8mdrihciz3v6ga7zw19jcv896rdhx75bx5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/transient-cycles.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tree-inspector = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      treeview,
+    }:
+    elpaBuild {
+      pname = "tree-inspector";
+      ename = "tree-inspector";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar";
+        sha256 = "0v59kp1didml9k245m1v0s0ahh2r79cc0hp5ika93iamrdxkxaiz";
+      };
+      packageRequires = [
+        emacs
+        treeview
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tree-inspector.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  trie = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      heap,
+      lib,
+      tNFA,
+    }:
+    elpaBuild {
+      pname = "trie";
+      ename = "trie";
+      version = "0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/trie-0.6.tar";
+        sha256 = "1jvhvvxkxbbpy93x9kpznvp2hqkkbdbbjaj27fd0wkbijg0k03ln";
+      };
+      packageRequires = [
+        heap
+        tNFA
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/trie.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  triples = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "triples";
+      ename = "triples";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/triples-0.3.5.tar";
+        sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/triples.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  typo = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "typo";
+      ename = "typo";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/typo-1.0.1.tar";
+        sha256 = "1w4m2admlgmx7d661l70rryyxbaahfvrvhxc1b9sq41nx88bmgn1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/typo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ulisp-repl = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ulisp-repl";
+      ename = "ulisp-repl";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ulisp-repl-1.0.3.tar";
+        sha256 = "1c23d66vydfp29px2dlvgl5xg91a0rh4w4b79q8ach533nfag3ia";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ulisp-repl.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  undo-tree = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "undo-tree";
+      ename = "undo-tree";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar";
+        sha256 = "0ad1zhkjdf73j3b2i8nd7f10jlqqvcaa852yycms4jr636xw6ms6";
+      };
+      packageRequires = [ queue ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/undo-tree.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  uni-confusables = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "uni-confusables";
+      ename = "uni-confusables";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar";
+        sha256 = "08150kgqsbcpykvf8m2b25y386h2b4pj08vffm6wh4f000wr72k3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/uni-confusables.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  uniquify-files = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "uniquify-files";
+      ename = "uniquify-files";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar";
+        sha256 = "0xw2l49xhdy5qgwja8bkiq2ibdppl45xzqlr17z92l1vfq4akpzp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/uniquify-files.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  urgrep = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "urgrep";
+      ename = "urgrep";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar";
+        sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi";
+      };
+      packageRequires = [
+        compat
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/urgrep.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  url-http-ntlm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+      ntlm ? null,
+    }:
+    elpaBuild {
+      pname = "url-http-ntlm";
+      ename = "url-http-ntlm";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar";
+        sha256 = "02b65z70kw37mzj2hh8q6z0zhhacf9sc4hlczpfxdfsy05b8yri9";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+        ntlm
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  url-http-oauth = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "url-http-oauth";
+      ename = "url-http-oauth";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/url-http-oauth-0.8.3.tar";
+        sha256 = "06lpzh8kpxn8cr92blxrjw44h2cfc6fw0pr024sign4acczx10ws";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/url-http-oauth.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  url-scgi = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "url-scgi";
+      ename = "url-scgi";
+      version = "0.9";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar";
+        sha256 = "19lvr4d2y9rd5gibaavp7ghkxmdh5zad9ynarbi2w4rjgmz5y981";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/url-scgi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  use-package = callPackage (
+    {
+      bind-key,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "use-package";
+      ename = "use-package";
+      version = "2.4.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar";
+        sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp";
+      };
+      packageRequires = [
+        bind-key
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/use-package.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  validate = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "validate";
+      ename = "validate";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/validate-1.0.4.tar";
+        sha256 = "1bn25l62zcabg2ppxwr4049m1qd0yj095cflqrak0n50acgjs6w5";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/validate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  valign = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "valign";
+      ename = "valign";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/valign-3.1.1.tar";
+        sha256 = "16v2mmrih0ykk4z6qmy29gajjb3v83q978gzn3y6pg8y48b2wxpb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/valign.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-backup = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-backup";
+      ename = "vc-backup";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar";
+        sha256 = "0a45bbrvk4s9cj3ih3hb6vqjv4hkwnz7m9a4mr45m6cb0sl9b8a3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-backup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-got = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-got";
+      ename = "vc-got";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vc-got-1.2.tar";
+        sha256 = "04m1frrnla4zc8db728280r9fbk50bgjkk4k7dizb0hawghk4r3p";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-got.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-hgcmd = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-hgcmd";
+      ename = "vc-hgcmd";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar";
+        sha256 = "0a8a4d9difrp2r6ac8micxn8ij96inba390324w087yxwqzkgk1g";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vcard = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vcard";
+      ename = "vcard";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar";
+        sha256 = "0r56y3q2gigm8rxifly50m5h1k948y987541cqd8w207wf1b56bh";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vcard.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vcl-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vcl-mode";
+      ename = "vcl-mode";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vcl-mode-1.1.tar";
+        sha256 = "0zz664c263x24xzs7hk2mqchzplmx2dlba98d5fpy8ybdnziqfkj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vcl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vdiff = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      hydra,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vdiff";
+      ename = "vdiff";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar";
+        sha256 = "0crgb32dk0yzcgvjai0b67wcbcfppc3h0ppfqgdrim1nincbwc1m";
+      };
+      packageRequires = [
+        emacs
+        hydra
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vdiff.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  verilog-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "verilog-mode";
+      ename = "verilog-mode";
+      version = "2024.3.1.121933719";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar";
+        sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/verilog-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vertico = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vertico";
+      ename = "vertico";
+      version = "1.8";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vertico-1.8.tar";
+        sha256 = "0k6sfla0183vyjf2yd9sycck9nxz0x659kygxgiaip3zq7f9zkg8";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vertico.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vertico-posframe = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      posframe,
+      vertico,
+    }:
+    elpaBuild {
+      pname = "vertico-posframe";
+      ename = "vertico-posframe";
+      version = "0.7.7";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar";
+        sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy";
+      };
+      packageRequires = [
+        emacs
+        posframe
+        vertico
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vertico-posframe.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vigenere = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vigenere";
+      ename = "vigenere";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vigenere-1.0.tar";
+        sha256 = "1zlni6amznzi9w96kj7lnhfrr049crva2l8kwl5jsvyaj5fc6nq5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vigenere.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  visual-filename-abbrev = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "visual-filename-abbrev";
+      ename = "visual-filename-abbrev";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar";
+        sha256 = "0vy4ar10wbdykzl47xnrfcwszjxyq2f1vhdbynfcmkcyrr40v4wm";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  visual-fill = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "visual-fill";
+      ename = "visual-fill";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/visual-fill-0.2.tar";
+        sha256 = "00r3cclhrdx5y0h1p1rrx5psvc8d95dayzpjdsy9xj44i8pcnvja";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/visual-fill.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vlf = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vlf";
+      ename = "vlf";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar";
+        sha256 = "1napxdavsrwb5dq2i4ka06rhmmfk6qixc8mm2a6ab68iavprrqkv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vlf.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vundo = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vundo";
+      ename = "vundo";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar";
+        sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vundo.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wcheck-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wcheck-mode";
+      ename = "wcheck-mode";
+      version = "2021";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar";
+        sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wcheck-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wconf = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wconf";
+      ename = "wconf";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/wconf-0.2.1.tar";
+        sha256 = "1ci5ysn2w9hjzcsv698b6mh14qbrmvlzn4spaq4wzwl9p8672n08";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wconf.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  web-server = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "web-server";
+      ename = "web-server";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar";
+        sha256 = "0wikajm4pbffcy8clwwb5bnz67isqmcsbf9kca8rzx4svzi5j2gc";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/web-server.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  webfeeder = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "webfeeder";
+      ename = "webfeeder";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar";
+        sha256 = "0418fpw2ra12n77560gh9j9ymv28d895bdhpr7x9xakvijjh705m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/webfeeder.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  websocket = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "websocket";
+      ename = "websocket";
+      version = "1.15";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/websocket-1.15.tar";
+        sha256 = "0cm3x6qzr4zqj46w0qfpn7n9g5z80figcv824869snvc74465h1g";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/websocket.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  which-key = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "which-key";
+      ename = "which-key";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar";
+        sha256 = "1lf8q6sq0hnrspj6qy49i48az3js24ab4y0gksw4giiifiqlc5ba";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/which-key.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  window-commander = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "window-commander";
+      ename = "window-commander";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar";
+        sha256 = "15345sgdmgz0vv9bk2cmffjp66i0msqj0xn2cxl7wny3bkfx8amv";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/window-commander.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  window-tool-bar = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "window-tool-bar";
+      ename = "window-tool-bar";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar";
+        sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  windower = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "windower";
+      ename = "windower";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/windower-0.0.1.el";
+        sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/windower.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  windresize = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "windresize";
+      ename = "windresize";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/windresize-0.1.tar";
+        sha256 = "1wjqrwrfql5c67yv59hc95ga0mkvrqz74gy46aawhn8r3xr65qai";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/windresize.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wisi = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "wisi";
+      ename = "wisi";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar";
+        sha256 = "0qa6nig33igv4sqk3fxzrmx889pswq10smj9c9l3phz2acqx8q92";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wisi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wisitoken-grammar-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      mmm-mode,
+      wisi,
+    }:
+    elpaBuild {
+      pname = "wisitoken-grammar-mode";
+      ename = "wisitoken-grammar-mode";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar";
+        sha256 = "0i0vy751ycbfp8l8ynzj6iqgvc3scllwysdchpjv4lyj0m7m3s20";
+      };
+      packageRequires = [
+        emacs
+        mmm-mode
+        wisi
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wpuzzle = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wpuzzle";
+      ename = "wpuzzle";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/wpuzzle-1.1.tar";
+        sha256 = "05dgvr1miqp870nl7c8dw7j1kv4mgwm8scynjfwbs9wjz4xmzc6c";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wpuzzle.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wrap-search = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wrap-search";
+      ename = "wrap-search";
+      version = "4.16.13";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/wrap-search-4.16.13.tar";
+        sha256 = "0h5wlvmxq1rcmkhmaan3118w5480xx1gblg73lsfhxnj2xkmhrbi";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wrap-search.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xclip = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xclip";
+      ename = "xclip";
+      version = "1.11";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xclip-1.11.tar";
+        sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xclip.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xeft = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xeft";
+      ename = "xeft";
+      version = "3.3";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xeft-3.3.tar";
+        sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xeft.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xelb = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xelb";
+      ename = "xelb";
+      version = "0.20";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xelb-0.20.tar";
+        sha256 = "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xelb.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xpm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      queue,
+    }:
+    elpaBuild {
+      pname = "xpm";
+      ename = "xpm";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xpm-1.0.5.tar";
+        sha256 = "12a12rmbc1c0j60nv1s8fgg3r2lcjw8hs7qpyscm7ggwanylxn6q";
+      };
+      packageRequires = [
+        cl-lib
+        queue
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xpm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xr = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xr";
+      ename = "xr";
+      version = "1.25";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xr-1.25.tar";
+        sha256 = "0jmhcrz6mj3fwm9acwv1jj6nlnqikprjgvglr3cgxysinqh6y3xi";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xr.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xref = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xref";
+      ename = "xref";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xref-1.7.0.tar";
+        sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xref.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xref-union = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xref-union";
+      ename = "xref-union";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar";
+        sha256 = "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xref-union.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yasnippet = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "yasnippet";
+      ename = "yasnippet";
+      version = "0.14.1";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar";
+        sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/yasnippet.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yasnippet-classic-snippets = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      yasnippet,
+    }:
+    elpaBuild {
+      pname = "yasnippet-classic-snippets";
+      ename = "yasnippet-classic-snippets";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar";
+        sha256 = "1qiw5592mj8gmq1lhdcpxfza7iqn4cmhn36vdskfa7zpd1lq26y1";
+      };
+      packageRequires = [ yasnippet ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zones = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "zones";
+      ename = "zones";
+      version = "2023.6.11";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar";
+        sha256 = "1z3kq0lfc4fbr9dnk9kj2hqcv60bnjp0x4kbxaxy77vv02a62rzc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/zones.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ztree = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ztree";
+      ename = "ztree";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar";
+        sha256 = "1yyh09jff31j5w6mqsnibig3wizv7acsw39pjjfv1rmngni2b8zi";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ztree.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zuul = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "zuul";
+      ename = "zuul";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar";
+        sha256 = "1mj54hm4cqidrmbxyqdjfsc3qcmjhbl0wii79bydx637dvpfvqgf";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/zuul.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index aba33d0f13bf1..8bffb346dedd5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -22,7 +22,7 @@ formats commits for you.
 
 */
 
-{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:
+{ lib, pkgs, buildPackages }:
 
 self: let
 
@@ -32,11 +32,6 @@ self: let
     });
   };
 
-  elpaBuild = import ../build-support/elpa.nix {
-    inherit lib stdenv texinfo writeText gcc;
-    inherit (self) emacs;
-  };
-
   # Use custom elpa url fetcher with fallback/uncompress
   fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
 
@@ -188,7 +183,7 @@ self: let
 
     elpaPackages = super // overrides;
 
-  in elpaPackages // { inherit elpaBuild; });
+  in elpaPackages);
 
 in
 generateElpa { }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
index 6875030b24942..130889e03b4ca 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
@@ -4,8 +4,8 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "nix-community";
     repo = "emacs2nix";
-    rev = "e5389c3d7be9c3af135f022d86c61767d41c364f";
-    sha256 = "sha256-mueyrGXgbjvmXQqPRuLUJdJuB5dqiGGdzCQ74Ud+Z9Y=";
+    rev = "cf706a3e7a4c56be2d4dc83cc453810dfa023967";
+    hash = "sha256-jVbRcjNNKfuOIz76EMbrQxnKCN9d9C+szrk0zC8DaNE=";
     fetchSubmodules = true;
   };
 in
@@ -13,6 +13,7 @@ pkgs.mkShell {
 
   packages = [
     pkgs.bash
+    pkgs.nixfmt-rfc-style
   ];
 
   EMACS2NIX = src;
diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix
index 391065ccfb20d..1a2a138b206af 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix
@@ -1,63 +1,111 @@
 lib: self:
 
 let
+  inherit (lib) elemAt;
 
-    fetcherGenerators = { repo ? null
-                        , url ? null
-                        , ... }:
-                        { sha256
-                        , commit
-                        , ...}: {
-      github = self.callPackage ({ fetchFromGitHub }:
-        fetchFromGitHub {
-          owner = lib.head (lib.splitString "/" repo);
-          repo = lib.head (lib.tail (lib.splitString "/" repo));
-          rev = commit;
-          inherit sha256;
-        }
-      ) {};
-      gitlab = self.callPackage ({ fetchFromGitLab }:
-        fetchFromGitLab {
-          owner = lib.head (lib.splitString "/" repo);
-          repo = lib.head (lib.tail (lib.splitString "/" repo));
-          rev = commit;
-          inherit sha256;
-        }
-      ) {};
-      git = self.callPackage ({ fetchgit }:
-        (fetchgit {
-          rev = commit;
-          inherit sha256 url;
-        }).overrideAttrs(_: {
-          GIT_SSL_NO_VERIFY = true;
-        })
-      ) {};
-      bitbucket = self.callPackage ({ fetchhg }:
-        fetchhg {
-          rev = commit;
-          url = "https://bitbucket.com/${repo}";
-          inherit sha256;
-        }
-      ) {};
-      hg = self.callPackage ({ fetchhg }:
-        fetchhg {
-          rev = commit;
-          inherit sha256 url;
-        }
-      ) {};
-      sourcehut = self.callPackage ({ fetchzip }:
-        fetchzip {
-          url = "https://git.sr.ht/~${repo}/archive/${commit}.tar.gz";
-          inherit sha256;
-        }
-      ) {};
-      codeberg = self.callPackage ({ fetchzip }:
-        fetchzip {
-          url = "https://codeberg.org/${repo}/archive/${commit}.tar.gz";
-          inherit sha256;
-        }
-      ) {};
-    };
+  matchForgeRepo = builtins.match "(.+)/(.+)";
+
+  fetchers = lib.mapAttrs (_: fetcher: self.callPackage fetcher { }) {
+    github =
+      { fetchFromGitHub }:
+      {
+        repo ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      let
+        m = matchForgeRepo repo;
+      in
+      assert m != null;
+      fetchFromGitHub {
+        owner = elemAt m 0;
+        repo = elemAt m 1;
+        rev = commit;
+        inherit sha256;
+      };
+
+    gitlab =
+      { fetchFromGitLab }:
+      {
+        repo ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      let
+        m = matchForgeRepo repo;
+      in
+      assert m != null;
+      fetchFromGitLab {
+        owner = elemAt m 0;
+        repo = elemAt m 1;
+        rev = commit;
+        inherit sha256;
+      };
+
+    git = (
+      { fetchgit }:
+      {
+        url ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      (fetchgit {
+        rev = commit;
+        inherit sha256 url;
+      }).overrideAttrs(_: {
+        GIT_SSL_NO_VERIFY = true;
+      })
+    );
+
+    bitbucket =
+      { fetchhg }:
+      {
+        repo ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      fetchhg {
+        rev = commit;
+        url = "https://bitbucket.com/${repo}";
+        inherit sha256;
+      };
+
+    hg =
+      { fetchhg }:
+      {
+        url ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      fetchhg {
+        rev = commit;
+        inherit sha256 url;
+      };
+
+    sourcehut =
+      { fetchzip }:
+      {
+        repo ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      fetchzip {
+        url = "https://git.sr.ht/~${repo}/archive/${commit}.tar.gz";
+        inherit sha256;
+      };
+
+    codeberg =
+      { fetchzip }:
+      {
+        repo ? null,
+        ...
+      }:
+      { sha256, commit, ... }:
+      fetchzip {
+        url = "https://codeberg.org/${repo}/archive/${commit}.tar.gz";
+        inherit sha256;
+      };
+  };
 
 in {
 
@@ -88,7 +136,7 @@ in {
                 (builtins.filter (n: n >= 0) version)));
             # TODO: Broken should not result in src being null (hack to avoid eval errors)
             src = if (sha256 == null || broken) then null else
-              lib.getAttr fetcher (fetcherGenerators args sourceArgs);
+              fetchers.${fetcher} args sourceArgs;
             recipe = if commit == null then null else
               fetchurl {
                 name = pname + "-recipe";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 406bd0c711004..e56d39aa2ce0e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
@@ -36,6 +36,7 @@ melpaBuild {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bbigras ];
     platforms = [
+      "aarch64-darwin"
       "x86_64-darwin"
       "x86_64-linux"
       "x86_64-windows"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 5148daad1903b..2a7b7b571d12e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -3,11 +3,15 @@
   fetchFromGitHub,
   melpaBuild,
   prop-menu,
+  gitUpdater,
 }:
 
-melpaBuild rec {
-  pname = "idris2-mode";
+let
   version = "1.1";
+in
+melpaBuild {
+  pname = "idris2-mode";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "idris-community";
@@ -20,10 +24,12 @@ melpaBuild rec {
     prop-menu
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://github.com/idris-community/idris2-mode";
     description = "Emacs mode for editing Idris 2 code";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ wuyoli ];
+    maintainers = with lib.maintainers; [ wuyoli AndersonTorres ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
index 7c9df31e5c285..3be4a3b56b969 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
@@ -24,6 +24,6 @@ melpaBuild {
     description = "Major mode for editing LIGO source code";
     homepage = "https://gitlab.com/ligolang/ligo";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
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 19b472cd663f3..7b879d1248e04 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
@@ -29,13 +29,13 @@ let
 in
 melpaBuild {
   pname = "lsp-bridge";
-  version = "0-unstable-2024-07-14";
+  version = "0-unstable-2024-07-27";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "023924926ae6adfbcf5458c350b90dea7c05d51b";
-    hash = "sha256-59bl4YbKS3HgrGJlUfM3LPabxKuuE+dT7CnVUJIl05k=";
+    rev = "92d58ff0fb938ced513d690e0daadef74737e5d4";
+    hash = "sha256-qeoKPwK3qKcvUFchaQYCCQmSlXgN+Tt2kU+lXqiUwaw=";
   };
 
   patches = [
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix
index f21e79c8f33d8..0238bb6127bdb 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     description = "Small session management for emacs";
     homepage = "https://emacs-session.sourceforge.net/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
new file mode 100644
index 0000000000000..45ab57b45f72b
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
@@ -0,0 +1,5243 @@
+{ callPackage }:
+{
+  adoc-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "adoc-mode";
+      ename = "adoc-mode";
+      version = "0.8.0snapshot0.20240218.103518";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0snapshot0.20240218.103518.tar";
+        sha256 = "149cj68amidnb9pgg3xh6bpfaxbcqlv5wnacajp4pr4cn5byr0sy";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/adoc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  afternoon-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "afternoon-theme";
+      ename = "afternoon-theme";
+      version = "0.1.0.20140104.185934";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/afternoon-theme-0.1.0.20140104.185934.tar";
+        sha256 = "07x6mfmwci8m7dsrvvd679a1pj56dcd82bzr9dnhi7hy5nvnb93d";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/afternoon-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  alect-themes = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "alect-themes";
+      ename = "alect-themes";
+      version = "0.10.0.20211022.165129";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/alect-themes-0.10.0.20211022.165129.tar";
+        sha256 = "1p9p5p58cyz5m1bsrm4icazm049n4q72mwawp0zlibsdqywjliqj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/alect-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ample-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ample-theme";
+      ename = "ample-theme";
+      version = "0.3.0.0.20240426.84530";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/ample-theme-0.3.0.0.20240426.84530.tar";
+        sha256 = "00h1za3qdqjgaxr2c3qlmz374gl9fhrgg7r453wvkz1fy6n9vp5i";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/ample-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  annotate = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "annotate";
+      ename = "annotate";
+      version = "2.2.2.0.20240509.114401";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.2.2.0.20240509.114401.tar";
+        sha256 = "0b78ilx6qwn2g0l6c1fn3vrm6bc2dgylpj8vm2wxwqyx621rf513";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/annotate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  anti-zenburn-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "anti-zenburn-theme";
+      ename = "anti-zenburn-theme";
+      version = "2.5.1.0.20180712.183837";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/anti-zenburn-theme-2.5.1.0.20180712.183837.tar";
+        sha256 = "1jn3kzzqjmcrfq381y71cc3ffyk0dr16nf86x193vm5jynbc3scq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/anti-zenburn-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  anzu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "anzu";
+      ename = "anzu";
+      version = "0.64.0.20240201.224751";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/anzu-0.64.0.20240201.224751.tar";
+        sha256 = "0gfhzb3064d8j4z91636imrh11202sy4905gc4j5rn2raylwwx73";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/anzu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  apache-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "apache-mode";
+      ename = "apache-mode";
+      version = "2.2.0.0.20240327.1751";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/apache-mode-2.2.0.0.20240327.1751.tar";
+        sha256 = "0yr3m1340327skxln7z2acns6kingaid4wryi9lyfv05fwhfgl5a";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/apache-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  apropospriate-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "apropospriate-theme";
+      ename = "apropospriate-theme";
+      version = "0.2.0.0.20240517.142324";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240517.142324.tar";
+        sha256 = "0pcgwz5qwl45h2c0mknw7h977v74lzpyyaxavnnm3hr8mfx1jlgm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  arduino-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      spinner,
+    }:
+    elpaBuild {
+      pname = "arduino-mode";
+      ename = "arduino-mode";
+      version = "1.3.1.0.20240527.160335";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/arduino-mode-1.3.1.0.20240527.160335.tar";
+        sha256 = "016cidd24b098jnqsxi79pigakhpdl9cglhypa50xf3nnqpa6p75";
+      };
+      packageRequires = [ spinner ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/arduino-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-dim-other-buffers = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-dim-other-buffers";
+      ename = "auto-dim-other-buffers";
+      version = "2.1.1.0.20240515.131159";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.1.1.0.20240515.131159.tar";
+        sha256 = "1dp3q1hrdcvi82pcj5hxha9yyy9lkdqs8kxfq6v7lq716wxkwxfl";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  autothemer = callPackage (
+    {
+      dash,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "autothemer";
+      ename = "autothemer";
+      version = "0.2.18.0.20230907.60046";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20230907.60046.tar";
+        sha256 = "0qay7d5z0p91kzpbp140daqyiclsksql6cnp0bn1602n4f3dn4ii";
+      };
+      packageRequires = [ dash ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/autothemer.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  base32 = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "base32";
+      ename = "base32";
+      version = "1.0.0.20240227.184114";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/base32-1.0.0.20240227.184114.tar";
+        sha256 = "0nxxymnxy9sd12w1kfj8n86zbhxf40mi12nmb3q0wigg2nynl31k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/base32.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bash-completion = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bash-completion";
+      ename = "bash-completion";
+      version = "3.1.1.0.20230612.110320";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20230612.110320.tar";
+        sha256 = "1jw3cx6mzxv0mpk9xs1q3vll9sfyvw2mvvvpk9zirq2l13c31cjg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/bash-completion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  beancount = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "beancount";
+      ename = "beancount";
+      version = "0.9.0.20240623.232746";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240623.232746.tar";
+        sha256 = "0h5cfjdvm1dx5dmdz8i3nk7h2kjs3w224jjb9c1agj3m6bh2kjbm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/beancount.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  better-jumper = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "better-jumper";
+      ename = "better-jumper";
+      version = "1.0.1.0.20220111.101829";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/better-jumper-1.0.1.0.20220111.101829.tar";
+        sha256 = "10wgfplj5sxr6lp0i9p5r0mvb2cf2xbpyfs6ky2kr4i5d9x29gaq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/better-jumper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bind-map = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bind-map";
+      ename = "bind-map";
+      version = "1.1.2.0.20240308.155008";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/bind-map-1.1.2.0.20240308.155008.tar";
+        sha256 = "1vrn55667x38qqcaqy8f9p1l5f79j551qjw4m01k5ndan1ybbs8p";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/bind-map.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bison-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bison-mode";
+      ename = "bison-mode";
+      version = "0.4.0.20210527.1753";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/bison-mode-0.4.0.20210527.1753.tar";
+        sha256 = "0mx6qvy68cnc2j9ji8qyryqwlmqfyf21v65iqcqpjqmi7h0w8rk1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/bison-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  blow = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "blow";
+      ename = "blow";
+      version = "1.0.0.20221128.51815";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/blow-1.0.0.20221128.51815.tar";
+        sha256 = "1g7y9p3gr4v7bzrmwyssx5pf6zj9i0s7rggqyq3c4gssachicdiy";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/blow.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  blueprint-ts-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "blueprint-ts-mode";
+      ename = "blueprint-ts-mode";
+      version = "0.0.3.0.20231031.183012";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/blueprint-ts-mode-0.0.3.0.20231031.183012.tar";
+        sha256 = "1pa2a2r54pn7lmkgmwrc2lxvnabjbjlqs8rgkmqrfgnq1gkrm6rh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/blueprint-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  boxquote = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "boxquote";
+      ename = "boxquote";
+      version = "2.3.0.20231216.85245";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/boxquote-2.3.0.20231216.85245.tar";
+        sha256 = "1b5kqxpvxfzq8n0q1bqjbyb0vmrsdm02qfai28ihxqixk4q8czbi";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/boxquote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buttercup = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buttercup";
+      ename = "buttercup";
+      version = "1.35.0.20240718.1456";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.35.0.20240718.1456.tar";
+        sha256 = "1f71i87mxd3z24mywwj3pdrdj4irg1k5bmrrlknbkm7i3427mm1z";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/buttercup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  camera = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "camera";
+      ename = "camera";
+      version = "0.3.0.20230828.93723";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/camera-0.3.0.20230828.93723.tar";
+        sha256 = "1mykzs3filgi3za7rq4imjy8hymy3i4nsr8k9bcqvd5h3z19ijhm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/camera.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  caml = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "caml";
+      ename = "caml";
+      version = "4.10snapshot0.20231010.232819";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/caml-4.10snapshot0.20231010.232819.tar";
+        sha256 = "0dw5429dy1m4jj0khs58fc8cisky8yd9m58ckhjx5qf1k1bm0hji";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/caml.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cdlatex = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cdlatex";
+      ename = "cdlatex";
+      version = "4.18.4.0.20231118.64512";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/cdlatex-4.18.4.0.20231118.64512.tar";
+        sha256 = "037lh3j49cv8yz0vwl441gg9s24im614gzjys6095mj794q47bq7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/cdlatex.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cider = callPackage (
+    {
+      clojure-mode,
+      elpaBuild,
+      fetchurl,
+      lib,
+      parseedn,
+      queue,
+      seq,
+      sesman,
+      spinner,
+      transient,
+    }:
+    elpaBuild {
+      pname = "cider";
+      ename = "cider";
+      version = "1.15.1.0.20240723.73804";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240723.73804.tar";
+        sha256 = "0l0fj27b0xxbv3y513i6jqc92bazcgbcrr8ij7vy7r5s14cin9x3";
+      };
+      packageRequires = [
+        clojure-mode
+        parseedn
+        queue
+        seq
+        sesman
+        spinner
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/cider.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  clojure-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "clojure-mode";
+      ename = "clojure-mode";
+      version = "5.20.0snapshot0.20240611.73422";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20240611.73422.tar";
+        sha256 = "1jlmg2f4gvxqknyw5lqs7aqaar0ghw21hqphsmcvakpcn7d0nqiz";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/clojure-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  clojure-ts-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "clojure-ts-mode";
+      ename = "clojure-ts-mode";
+      version = "0.2.2.0.20240725.113944";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240725.113944.tar";
+        sha256 = "0v487r0inll37lp6rvd9ljyv5286xqpkcv28lbchbl71x2pm73ac";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  coffee-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "coffee-mode";
+      ename = "coffee-mode";
+      version = "0.6.3.0.20230908.103000";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/coffee-mode-0.6.3.0.20230908.103000.tar";
+        sha256 = "171rj50xg708lmqmxh73ij92vdx07di2yw77bfywrbhrqb2bhvh6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/coffee-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-flycheck = callPackage (
+    {
+      consult,
+      elpaBuild,
+      fetchurl,
+      flycheck,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-flycheck";
+      ename = "consult-flycheck";
+      version = "1.0.0.20240718.101150";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240718.101150.tar";
+        sha256 = "054mkwddsdyh3kkj0ky35gq38j2j4hxx98k5igx6awqsm1mpwgz1";
+      };
+      packageRequires = [
+        consult
+        flycheck
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  corfu-terminal = callPackage (
+    {
+      corfu,
+      elpaBuild,
+      fetchurl,
+      lib,
+      popon,
+    }:
+    elpaBuild {
+      pname = "corfu-terminal";
+      ename = "corfu-terminal";
+      version = "0.7.0.20230810.20636";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/corfu-terminal-0.7.0.20230810.20636.tar";
+        sha256 = "0cz5qzdz4npd9lc4z06mwclrp6w1vw6vdqzgkhdjnfgi0ciylil0";
+      };
+      packageRequires = [
+        corfu
+        popon
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/corfu-terminal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  crux = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "crux";
+      ename = "crux";
+      version = "0.5.0.0.20240401.113645";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/crux-0.5.0.0.20240401.113645.tar";
+        sha256 = "12pk351yrj850rg1yd9spxwrhkjlllgxbpbpfs829vnbpnvxlp6f";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/crux.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  csv2ledger = callPackage (
+    {
+      csv-mode,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "csv2ledger";
+      ename = "csv2ledger";
+      version = "1.5.4.0.20240605.63224";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20240605.63224.tar";
+        sha256 = "0vh626mic3nd4ci7hc1ci8rmfh3k6frh8azgkj4784n3nhgr18h8";
+      };
+      packageRequires = [ csv-mode ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/csv2ledger.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cyberpunk-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cyberpunk-theme";
+      ename = "cyberpunk-theme";
+      version = "1.22.0.20240112.144451";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/cyberpunk-theme-1.22.0.20240112.144451.tar";
+        sha256 = "05p6159ay4lil44mq7a1715jjv3rw6lh5f1ax4w98lf7v4kwl0hx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/cyberpunk-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cycle-at-point = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      recomplete,
+    }:
+    elpaBuild {
+      pname = "cycle-at-point";
+      ename = "cycle-at-point";
+      version = "0.2.0.20240422.30057";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20240422.30057.tar";
+        sha256 = "18nlbg8jwdgvi56qgbvqs0z8yfj9nkw30da45d7anjaln6a8089j";
+      };
+      packageRequires = [ recomplete ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  d-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "d-mode";
+      ename = "d-mode";
+      version = "202405290611.0.20240722.23216";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202405290611.0.20240722.23216.tar";
+        sha256 = "1ldl6pb1dk75zgmf92x35zv5wxn6hhj9ljj33kyf3pbw3jpmaljw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/d-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dart-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dart-mode";
+      ename = "dart-mode";
+      version = "1.0.7.0.20240523.181912";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20240523.181912.tar";
+        sha256 = "1v2nxiin07g3kycids2f9ixgnc3gcm592xs6022ks9px5x3rnnv9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/dart-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-refs = callPackage (
+    {
+      denote,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-refs";
+      ename = "denote-refs";
+      version = "0.1.2.0.20230115.155857";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/denote-refs-0.1.2.0.20230115.155857.tar";
+        sha256 = "02d8vmlhxjj4vqlk8mnrym1xqdgznf83n7a8am5i3blrc3s48zs0";
+      };
+      packageRequires = [ denote ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/denote-refs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devhelp = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devhelp";
+      ename = "devhelp";
+      version = "1.0.0.20221128.51631";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/devhelp-1.0.0.20221128.51631.tar";
+        sha256 = "0mkpagxz3vj8cwx9rxrdzygjf448iplmr89pani1q755ikz19njh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/devhelp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diff-ansi = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diff-ansi";
+      ename = "diff-ansi";
+      version = "0.2.0.20240616.234552";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20240616.234552.tar";
+        sha256 = "12cb4h3w6j0hissma1p9q173q9g379b01h8359wrj9ynbyrvdbsh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/diff-ansi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  doc-show-inline = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "doc-show-inline";
+      ename = "doc-show-inline";
+      version = "0.1.0.20240616.234552";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20240616.234552.tar";
+        sha256 = "0p39glahjqm2fv8xcnwyhcnzsf53g15013jbnj1lh7610bdgfk6g";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dockerfile-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dockerfile-mode";
+      ename = "dockerfile-mode";
+      version = "1.7.0.20240324.61044";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.7.0.20240324.61044.tar";
+        sha256 = "0815zw60kjhsypriafi603vm3svp5x1bh5la0m9m9kw7dvgy04bj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dracula-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dracula-theme";
+      ename = "dracula-theme";
+      version = "1.8.2.0.20240614.130330";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240614.130330.tar";
+        sha256 = "04z1n3ay5n75bdz2fic9nzgjgsvvagl6620abi8gnznig85d60k7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/dracula-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  drupal-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      php-mode,
+    }:
+    elpaBuild {
+      pname = "drupal-mode";
+      ename = "drupal-mode";
+      version = "0.7.4.0.20220125.104446";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/drupal-mode-0.7.4.0.20220125.104446.tar";
+        sha256 = "03j8qa0yh382mr5jzlgyh60v9xaln1a3rs101cvnd9sibbw08p4g";
+      };
+      packageRequires = [ php-mode ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/drupal-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dslide = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dslide";
+      ename = "dslide";
+      version = "0.5.3.0.20240704.131127";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.3.0.20240704.131127.tar";
+        sha256 = "0mr4p3w5932bz9cj9b4b2lmp5dkrix79s6vf4s2h2rr8cjhgbb6s";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/dslide.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eat = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "eat";
+      ename = "eat";
+      version = "0.9.4.0.20240314.193241";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/eat-0.9.4.0.20240314.193241.tar";
+        sha256 = "1ry5mlg9wmdr4n5zjq1n45z0xhnrpgjyr6611xd9j43i6dnldb38";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/eat.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  edit-indirect = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "edit-indirect";
+      ename = "edit-indirect";
+      version = "0.1.13.0.20240128.11949";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/edit-indirect-0.1.13.0.20240128.11949.tar";
+        sha256 = "1hb37vcda0ksbkm4ibr3nz5d8l4s15awff5qhdvjxihsnnj7fnz1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/edit-indirect.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  editorconfig = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "editorconfig";
+      ename = "editorconfig";
+      version = "0.11.0.0.20240728.171401";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240728.171401.tar";
+        sha256 = "0hjmhg81yrbxz307id9vfys91nfsbhbsx29w00rgiy8b80c63ycy";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/editorconfig.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elixir-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "elixir-mode";
+      ename = "elixir-mode";
+      version = "2.5.0.0.20230626.143859";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/elixir-mode-2.5.0.0.20230626.143859.tar";
+        sha256 = "109v0lh9jfrva2qxa0zxw2zgjl4q67rx3ijsgsyg3m1p8rx2kpba";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/elixir-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elpher = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "elpher";
+      ename = "elpher";
+      version = "3.6.2.0.20240702.81639";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.2.0.20240702.81639.tar";
+        sha256 = "18b8g5z0w81704b84av6mcq2mf9mlj83qr18l2y7fv2qv16kwz85";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/elpher.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  emacsql = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "emacsql";
+      ename = "emacsql";
+      version = "3.1.1.50snapshot0.20240714.182430";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/emacsql-3.1.1.50snapshot0.20240714.182430.tar";
+        sha256 = "03x0niccgc3iscz2pdbc86x4haf75kmp090knmsc1h5qwx5b2mxi";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/emacsql.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  engine-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "engine-mode";
+      ename = "engine-mode";
+      version = "2.2.4.0.20230911.95607";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/engine-mode-2.2.4.0.20230911.95607.tar";
+        sha256 = "05avl4rdv2drlg9vzwld064dpf53cyqbf8pqnglsxwrimm7cd9yv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/engine-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      goto-chg,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil";
+      ename = "evil";
+      version = "1.15.0.0.20240721.204520";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240721.204520.tar";
+        sha256 = "1fqxqzdlrm9i7ipkn0yvn18yh8yi3mqilnadm389k1lylw4aqamj";
+      };
+      packageRequires = [
+        cl-lib
+        goto-chg
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-anzu = callPackage (
+    {
+      anzu,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-anzu";
+      ename = "evil-anzu";
+      version = "0.2.0.20220911.193944";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-anzu-0.2.0.20220911.193944.tar";
+        sha256 = "0ap13nrpcjm9q7pia8jy544sc08gc44bgyqi7yvkh2yk8cw96g8m";
+      };
+      packageRequires = [
+        anzu
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-anzu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-args = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-args";
+      ename = "evil-args";
+      version = "1.1.0.20240209.210417";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-args-1.1.0.20240209.210417.tar";
+        sha256 = "0k1awcw8rdc5fwj03kw1xmc4iw2ivmv39lrs4pdp9by7396i6829";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-args.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-escape = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-escape";
+      ename = "evil-escape";
+      version = "3.16.0.20231122.211452";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-escape-3.16.0.20231122.211452.tar";
+        sha256 = "1yv77vxvyl41795h7ixl6fhm43n7q6xqkqp1yaqgv5g9iymdj1s0";
+      };
+      packageRequires = [
+        cl-lib
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-escape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-exchange = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-exchange";
+      ename = "evil-exchange";
+      version = "0.41.0.20220111.55801";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-exchange-0.41.0.20220111.55801.tar";
+        sha256 = "0fgw327b2gpppynrxpp6gs2ixhzchgi5wg97nan7cf5cp3c367ax";
+      };
+      packageRequires = [
+        cl-lib
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-exchange.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-goggles = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-goggles";
+      ename = "evil-goggles";
+      version = "0.0.2.0.20231021.73827";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-goggles-0.0.2.0.20231021.73827.tar";
+        sha256 = "10h27w2id8iv53nndjpv9rb99v758j041l2h4kl1kfy2ar8a7vk6";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-goggles.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-iedit-state = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      iedit,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-iedit-state";
+      ename = "evil-iedit-state";
+      version = "1.3.0.20220219.93900";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-iedit-state-1.3.0.20220219.93900.tar";
+        sha256 = "1fvwjvhzrkiaixvfsh2nrlhsvyw5igaighfpk57mnbyxarfc1564";
+      };
+      packageRequires = [
+        evil
+        iedit
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-iedit-state.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-indent-plus = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-indent-plus";
+      ename = "evil-indent-plus";
+      version = "1.0.1.0.20230927.151313";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-indent-plus-1.0.1.0.20230927.151313.tar";
+        sha256 = "0vm6bsy33hc79nz17861wrxs3l56fsgc08s1lr6v3k65nwkv6i3m";
+      };
+      packageRequires = [
+        cl-lib
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-indent-plus.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-lisp-state = callPackage (
+    {
+      bind-map,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+      smartparens,
+    }:
+    elpaBuild {
+      pname = "evil-lisp-state";
+      ename = "evil-lisp-state";
+      version = "8.2.0.20160403.224859";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-lisp-state-8.2.0.20160403.224859.tar";
+        sha256 = "0ms80bxj64n7rqwjlqk4yqwwa1g90ldmb9vs597axzs25mv5jszk";
+      };
+      packageRequires = [
+        bind-map
+        evil
+        smartparens
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-lisp-state.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-matchit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-matchit";
+      ename = "evil-matchit";
+      version = "3.0.4.0.20240418.73107";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20240418.73107.tar";
+        sha256 = "01fsamf87a35xmw03b93yvvlkz2mi7xg9pblzakacwfnwksxr76i";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-matchit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-nerd-commenter = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-nerd-commenter";
+      ename = "evil-nerd-commenter";
+      version = "3.6.1.0.20240216.114656";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-nerd-commenter-3.6.1.0.20240216.114656.tar";
+        sha256 = "0wav3c5k2iz4xzrkwj7nj3xg5zp9nldynxag2gl7p3nkz4scg49r";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-nerd-commenter.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-numbers = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-numbers";
+      ename = "evil-numbers";
+      version = "0.7.0.20240416.14058";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20240416.14058.tar";
+        sha256 = "1xn9r9iycrha64n379q8kqdbywcfqcwc9qqlnxi268rcxzsq99rx";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-numbers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-surround = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-surround";
+      ename = "evil-surround";
+      version = "1.0.4.0.20240325.85222";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-surround-1.0.4.0.20240325.85222.tar";
+        sha256 = "0ji4pp9dp0284km585a3iay60m9v0xzsn42g3fw431vadbs0y5ym";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-surround.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-visual-mark-mode = callPackage (
+    {
+      dash,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-visual-mark-mode";
+      ename = "evil-visual-mark-mode";
+      version = "0.0.5.0.20230202.31851";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-visual-mark-mode-0.0.5.0.20230202.31851.tar";
+        sha256 = "1n394k0mm3g44ai101651168h7gw8nr1ci2acb0bfr5qcpdc7g8d";
+      };
+      packageRequires = [
+        dash
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-visual-mark-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-visualstar = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-visualstar";
+      ename = "evil-visualstar";
+      version = "0.2.0.0.20160222.194815";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/evil-visualstar-0.2.0.0.20160222.194815.tar";
+        sha256 = "1577xx0fblnf7n28brfi959kw3hw85498vza1dsh6r5nhalawhg7";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/evil-visualstar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  exec-path-from-shell = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "exec-path-from-shell";
+      ename = "exec-path-from-shell";
+      version = "2.2.0.20240411.85903";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20240411.85903.tar";
+        sha256 = "1z8dxx8x87ndx4mfq2nhj2q6m0h5zd2v80pbwxirz4qnvivqspgv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flx = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flx";
+      ename = "flx";
+      version = "0.6.2.0.20240204.195634";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/flx-0.6.2.0.20240204.195634.tar";
+        sha256 = "0k2irlx6v1mn23qvpsq1p6mdy8a78sx9xbnvy9ah1hnsq2z9x4ay";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/flx.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flx-ido = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      flx,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flx-ido";
+      ename = "flx-ido";
+      version = "0.6.2.0.20240204.195634";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/flx-ido-0.6.2.0.20240204.195634.tar";
+        sha256 = "1d9hg8pryf30bz9rnpb081vhw2axvbk62i9wiyfq0n0zwi23dwhj";
+      };
+      packageRequires = [
+        cl-lib
+        flx
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/flx-ido.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flycheck = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flycheck";
+      ename = "flycheck";
+      version = "35.0snapshot0.20240726.45656";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20240726.45656.tar";
+        sha256 = "09hy61g6rcvl1xng2bnav9x58rg0ddq39mj4gicsyyxyqfyp2gc7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/flycheck.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-guile = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      flymake ? null,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-guile";
+      ename = "flymake-guile";
+      version = "0.5.0.20230905.194410";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/flymake-guile-0.5.0.20230905.194410.tar";
+        sha256 = "1zxyz5nsx8dsg0x8ad6vkqs34pca62avswcvvkpgrcapxqvah9dq";
+      };
+      packageRequires = [ flymake ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/flymake-guile.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-kondor = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-kondor";
+      ename = "flymake-kondor";
+      version = "0.1.3.0.20211026.50126";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/flymake-kondor-0.1.3.0.20211026.50126.tar";
+        sha256 = "0b64x7rziyzr0db0hgfcccy3gw95588q6bs77v4d9gyjl32yz8jn";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/flymake-kondor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-popon = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      flymake ? null,
+      lib,
+      popon,
+      posframe,
+    }:
+    elpaBuild {
+      pname = "flymake-popon";
+      ename = "flymake-popon";
+      version = "0.5.1.0.20230208.145056";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/flymake-popon-0.5.1.0.20230208.145056.tar";
+        sha256 = "0afkz6izdxzizip48ggnr1cdcfxkrj7ww1lb7jvd0cbpsx7lc126";
+      };
+      packageRequires = [
+        flymake
+        popon
+        posframe
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/flymake-popon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  focus = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "focus";
+      ename = "focus";
+      version = "1.0.1.0.20240528.90117";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/focus-1.0.1.0.20240528.90117.tar";
+        sha256 = "0krfsxswwjzajxzr6kjxnkmzgi5nysnwa1yrhd205z1spb36i9i0";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/focus.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  forth-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "forth-mode";
+      ename = "forth-mode";
+      version = "0.2.0.20231206.112722";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/forth-mode-0.2.0.20231206.112722.tar";
+        sha256 = "0vx3ic6xjpw6xfxb42n7fipkrxfbn1z86hngzg1yz77mig0fvw3n";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/forth-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  free-keys = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "free-keys";
+      ename = "free-keys";
+      version = "1.0.0.20211116.150106";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/free-keys-1.0.0.20211116.150106.tar";
+        sha256 = "08z5w5xxaz577lnwfmvrbh7485rbra7rl6b77m54vjxi24m75jhv";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/free-keys.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gc-buffers = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gc-buffers";
+      ename = "gc-buffers";
+      version = "1.0.0.20221128.50935";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gc-buffers-1.0.0.20221128.50935.tar";
+        sha256 = "0c7pwhpk4qmw6jdryabr051vwm5k0r9p1snwl1117wavcbdf3psx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gc-buffers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "geiser";
+      ename = "geiser";
+      version = "0.31.0.20240726.121756";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.0.20240726.121756.tar";
+        sha256 = "19mfyvr13c95qpjrx7ngrraifiaqihpxkh7d6p5j0pda37hq5vav";
+      };
+      packageRequires = [ project ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-chez = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-chez";
+      ename = "geiser-chez";
+      version = "0.18.0.20230707.93440";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chez-0.18.0.20230707.93440.tar";
+        sha256 = "1rl6qazqjjcwzyanx4bra3xmw9fjrpa6dkz36kfcvj8i8z7hsmcq";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-chez.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-chibi = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-chibi";
+      ename = "geiser-chibi";
+      version = "0.17.0.20240521.155242";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi-0.17.0.20240521.155242.tar";
+        sha256 = "0xiaikj274ypfj546snxpi6h30jlc9hifhnw8ljj1zxsafr1wzqq";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-chicken = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-chicken";
+      ename = "geiser-chicken";
+      version = "0.17.0.20220717.113055";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20220717.113055.tar";
+        sha256 = "1ajdmkykm23rxcnsbqadc39h72r30cdqzhxasq9s5hnnpk8qmyxk";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-gambit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-gambit";
+      ename = "geiser-gambit";
+      version = "0.18.1.0.20220208.135610";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-gambit-0.18.1.0.20220208.135610.tar";
+        sha256 = "07m1n1m8n869wdmwvfjimd8yamxp6hbx40mz07fcm826m553v670";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-gambit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-gauche = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-gauche";
+      ename = "geiser-gauche";
+      version = "0.0.2.0.20220503.170006";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-gauche-0.0.2.0.20220503.170006.tar";
+        sha256 = "159wlbsv6wr0wpp4y0a5y2dm7bk4rpzkvc7phl9ry3a60r10h8yc";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-gauche.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-guile = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "geiser-guile";
+      ename = "geiser-guile";
+      version = "0.28.1.0.20240712.120235";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.1.0.20240712.120235.tar";
+        sha256 = "1hvqxzjnygsg74cjlhnk9c22rwwizwnn5zkb1g7f8ifykzmvmxr7";
+      };
+      packageRequires = [
+        geiser
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-guile.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-kawa = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-kawa";
+      ename = "geiser-kawa";
+      version = "0.0.1.0.20210920.160740";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-kawa-0.0.1.0.20210920.160740.tar";
+        sha256 = "1qbdmzv81gn3y3rgm10yadhw86a0p9lmxq8da4865x9gkccf2wa6";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-kawa.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-mit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-mit";
+      ename = "geiser-mit";
+      version = "0.15.0.20211204.193555";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-mit-0.15.0.20211204.193555.tar";
+        sha256 = "146pvaj6y60vg57swna1nh9f7hjkkxq3033204vqyn0gbqy6psyw";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-mit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-racket = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-racket";
+      ename = "geiser-racket";
+      version = "0.16.0.20210421.12547";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-racket-0.16.0.20210421.12547.tar";
+        sha256 = "0vqs61ga54mj241p7l5mly9pn8m819znm2dvw3hnlw3p6xp89fgq";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-racket.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-stklos = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-stklos";
+      ename = "geiser-stklos";
+      version = "1.8.0.20240521.161150";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos-1.8.0.20240521.161150.tar";
+        sha256 = "13y0p8iqm4lrjg5ksb8d3rgpmjs0kwak7zicdq5m7sx1x511znd7";
+      };
+      packageRequires = [ geiser ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  git-commit = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+      transient,
+      with-editor,
+    }:
+    elpaBuild {
+      pname = "git-commit";
+      ename = "git-commit";
+      version = "3.3.0.50snapshot0.20240727.200453";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/git-commit-3.3.0.50snapshot0.20240727.200453.tar";
+        sha256 = "0whszyd51qzkng3fxpbr4p6vvly6b8w6n6879dq7swv0r9al4rdf";
+      };
+      packageRequires = [
+        compat
+        seq
+        transient
+        with-editor
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/git-commit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  git-modes = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "git-modes";
+      ename = "git-modes";
+      version = "1.4.3.0.20240713.191814";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.3.0.20240713.191814.tar";
+        sha256 = "1rlr9cvz9vnxdzrwbr9vcs5wis6a987yr465c5mhqly8m506jmn2";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/git-modes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-apl-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-apl-mode";
+      ename = "gnu-apl-mode";
+      version = "1.5.1.0.20220404.34102";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gnu-apl-mode-1.5.1.0.20220404.34102.tar";
+        sha256 = "1da6vl1pr0k1id04fgw9pm5zcf5dkbwnx7xjgymg3n6yvm54f9kg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gnu-apl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-indent = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-indent";
+      ename = "gnu-indent";
+      version = "1.0.0.20221127.211255";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gnu-indent-1.0.0.20221127.211255.tar";
+        sha256 = "1vfiwcw6cdl1861pjyc40r8wvagl9szqbk2icl4knl35jakxh6vl";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gnu-indent.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnuplot = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnuplot";
+      ename = "gnuplot";
+      version = "0.8.1.0.20230727.75810";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20230727.75810.tar";
+        sha256 = "16708cxz3jc0yw7wppdbqywy1k9drq9kqbk6j1sv1s7n1gc0xh00";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gnuplot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  go-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "go-mode";
+      ename = "go-mode";
+      version = "1.6.0.0.20240630.202407";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/go-mode-1.6.0.0.20240630.202407.tar";
+        sha256 = "0l99vsah7j79pfz0wnvpw4c7i9fw3miipfi7givgxanjrnyra859";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/go-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  golden-ratio = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "golden-ratio";
+      ename = "golden-ratio";
+      version = "1.0.1.0.20230912.112557";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/golden-ratio-1.0.1.0.20230912.112557.tar";
+        sha256 = "1gwa5f9fclhky7kvpd1pwfrvx11jqjn3iqhxis4na6syh7ypk8vm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/golden-ratio.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gotham-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gotham-theme";
+      ename = "gotham-theme";
+      version = "1.1.9.0.20220107.173034";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gotham-theme-1.1.9.0.20220107.173034.tar";
+        sha256 = "0zx9c4vh5sc6yl3m4fxpd5x77qvqqirpzkv2hwshxprhs5g9f4c8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gotham-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  goto-chg = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "goto-chg";
+      ename = "goto-chg";
+      version = "1.7.5.0.20240407.111017";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/goto-chg-1.7.5.0.20240407.111017.tar";
+        sha256 = "0pg8k9idb59wp2h51b50dplw454caqa9gn9bcpvfil1fi7hg17h2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/goto-chg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gptel = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "gptel";
+      ename = "gptel";
+      version = "0.9.0.0.20240724.131301";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240724.131301.tar";
+        sha256 = "0acyy66gxdm134k9k2jag69y7sk7c56x8grmq0b7xq919ixdjky4";
+      };
+      packageRequires = [
+        compat
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gptel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  graphql-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "graphql-mode";
+      ename = "graphql-mode";
+      version = "1.0.0.0.20240328.173129";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240328.173129.tar";
+        sha256 = "1pwlmi35iyp397a3f7ipb5i1lx6v6qc03xz0l7nh4xlv0bkwxzk5";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/graphql-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gruber-darker-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gruber-darker-theme";
+      ename = "gruber-darker-theme";
+      version = "0.7.0.20231026.203102";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gruber-darker-theme-0.7.0.20231026.203102.tar";
+        sha256 = "1hr2p575kz15yh4n68jymdm2i0kn7adynlnpqmcqqp8l4pr83v1f";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gruber-darker-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gruvbox-theme = callPackage (
+    {
+      autothemer,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gruvbox-theme";
+      ename = "gruvbox-theme";
+      version = "1.30.1.0.20240615.43214";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme-1.30.1.0.20240615.43214.tar";
+        sha256 = "0fvhcilfkhwm544z3f16vssxc7fda1klib8fidnylaqj477pfigz";
+      };
+      packageRequires = [ autothemer ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  guru-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "guru-mode";
+      ename = "guru-mode";
+      version = "1.0.0.20211025.115715";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/guru-mode-1.0.0.20211025.115715.tar";
+        sha256 = "0xs41855s581xbps3clx1s1wd0rhjxm0dnlhillnqbw409phzhs5";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/guru-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  haml-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "haml-mode";
+      ename = "haml-mode";
+      version = "3.2.1.0.20231110.173413";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/haml-mode-3.2.1.0.20231110.173413.tar";
+        sha256 = "0fb5mi0cqwi8186j8cqbzy1zhragj6kwxw779rkhx410vcarl4zi";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/haml-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  haskell-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "haskell-mode";
+      ename = "haskell-mode";
+      version = "17.5.0.20240527.85346";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20240527.85346.tar";
+        sha256 = "0wdanl6dh3j4z00mrqz3763gg8gjx9c3qsfd1mkz4as17dmqppjm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/haskell-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  haskell-tng-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      popup,
+    }:
+    elpaBuild {
+      pname = "haskell-tng-mode";
+      ename = "haskell-tng-mode";
+      version = "0.0.1.0.20230522.221126";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/haskell-tng-mode-0.0.1.0.20230522.221126.tar";
+        sha256 = "0744xvrnjvn30vwbfdnndmb1x1ynmz87wvdb94syd1blfkdi9f6j";
+      };
+      packageRequires = [ popup ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/haskell-tng-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  helm = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      helm-core,
+      lib,
+      wfnames,
+    }:
+    elpaBuild {
+      pname = "helm";
+      ename = "helm";
+      version = "3.9.9.0.20240728.45939";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240728.45939.tar";
+        sha256 = "0gbnn8d0aki55l959pxbhzp5039zzjijxga5lbiwgh9h5dnj3kan";
+      };
+      packageRequires = [
+        helm-core
+        wfnames
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/helm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  helm-core = callPackage (
+    {
+      async,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "helm-core";
+      ename = "helm-core";
+      version = "3.9.9.0.20240728.45939";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240728.45939.tar";
+        sha256 = "1fz4vrk85df684vsgy38iwrsvdhz4ydriws09bkzicx3nxmyh8rj";
+      };
+      packageRequires = [ async ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/helm-core.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hideshowvis = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hideshowvis";
+      ename = "hideshowvis";
+      version = "0.8.0.20240529.112833";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/hideshowvis-0.8.0.20240529.112833.tar";
+        sha256 = "0wb1i3p79wf39svgbvdjlhivbyankm4xklf1r63i5vlaxz5fc6di";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/hideshowvis.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  highlight-parentheses = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "highlight-parentheses";
+      ename = "highlight-parentheses";
+      version = "2.2.2.0.20240408.112634";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/highlight-parentheses-2.2.2.0.20240408.112634.tar";
+        sha256 = "0by35fba69xnvq7jglr62i168s4jpy8jqs76gk29z92jcwk1brig";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/highlight-parentheses.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hl-block-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hl-block-mode";
+      ename = "hl-block-mode";
+      version = "0.2.0.20240422.12652";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20240422.12652.tar";
+        sha256 = "1j3fp1p066j9b67hna6mh7pb96kld9nc0mkv8jl0qdwi95aah81q";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hl-column = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hl-column";
+      ename = "hl-column";
+      version = "1.0.0.20221128.50752";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/hl-column-1.0.0.20221128.50752.tar";
+        sha256 = "1zvfj0271pphl8h1d9mjmicrc81s3v0jq6p9ca4cnwdk6h9x1igg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/hl-column.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  htmlize = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "htmlize";
+      ename = "htmlize";
+      version = "1.57.0.20240527.145632";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/htmlize-1.57.0.20240527.145632.tar";
+        sha256 = "1wcx6hi2jiaac801hzhiix5ymhxmh8whwbjd5l9fbjfhxf0m0r9b";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/htmlize.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hyperdrive = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      map,
+      org,
+      persist,
+      plz,
+      taxy-magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "hyperdrive";
+      ename = "hyperdrive";
+      version = "0.4pre0.20240728.163952";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240728.163952.tar";
+        sha256 = "00c67xdm2rypdcxd5v0n683csnd4abiyn85mbly66vkjiw472fi8";
+      };
+      packageRequires = [
+        compat
+        map
+        org
+        persist
+        plz
+        taxy-magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/hyperdrive.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  idle-highlight-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "idle-highlight-mode";
+      ename = "idle-highlight-mode";
+      version = "1.1.4.0.20240421.64727";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/idle-highlight-mode-1.1.4.0.20240421.64727.tar";
+        sha256 = "0wdzvy6zhxsr4i7s0169s8pl0bd3sms2xjqlvppkyqfmvwiggqkm";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/idle-highlight-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  idris-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      prop-menu,
+    }:
+    elpaBuild {
+      pname = "idris-mode";
+      ename = "idris-mode";
+      version = "1.1.0.0.20240704.133442";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20240704.133442.tar";
+        sha256 = "0rbgv5gkm6q3a6l8yqmgn3mn6ic9jr1w80vrl4gvkfpklwys9y5f";
+      };
+      packageRequires = [
+        cl-lib
+        prop-menu
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/idris-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  iedit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "iedit";
+      ename = "iedit";
+      version = "0.9.9.9.9.0.20220216.75011";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/iedit-0.9.9.9.9.0.20220216.75011.tar";
+        sha256 = "0q31dfsh3ay2ls7f4i2f52zzjz62glwnccqmxww938hayn23lfg2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/iedit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inf-clojure = callPackage (
+    {
+      clojure-mode,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inf-clojure";
+      ename = "inf-clojure";
+      version = "3.2.1.0.20230909.44557";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/inf-clojure-3.2.1.0.20230909.44557.tar";
+        sha256 = "0ncdqbz8z8wrcf3s1y3n1b11b7k3mwxdk4w5v7pr0j6jn3yfnbby";
+      };
+      packageRequires = [ clojure-mode ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/inf-clojure.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inf-ruby = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inf-ruby";
+      ename = "inf-ruby";
+      version = "2.8.1.0.20240627.213541";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240627.213541.tar";
+        sha256 = "0yw67r2jwhrsxdzx1hnri6w8wxm5z76fxxbk333xf043gw5cg8ay";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/inf-ruby.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inkpot-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inkpot-theme";
+      ename = "inkpot-theme";
+      version = "0.1.0.20240610.140611";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/inkpot-theme-0.1.0.20240610.140611.tar";
+        sha256 = "1291cwg6vk9y8an6a1pfbv05g2yqcswwry25c9ingsyb4ql0pr6k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/inkpot-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  iwindow = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "iwindow";
+      ename = "iwindow";
+      version = "1.1.0.20230920.203903";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/iwindow-1.1.0.20230920.203903.tar";
+        sha256 = "0xjwignqff11y92lcscs0ssg19jh7pgap5i7kdx50nwp7g1wz57h";
+      };
+      packageRequires = [
+        compat
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/iwindow.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  j-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "j-mode";
+      ename = "j-mode";
+      version = "2.0.1.0.20240611.171122";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240611.171122.tar";
+        sha256 = "1c4k74an4ib2zv19mjxxn9vl34w0ybyhmmgiv1l8jimqn5vi293h";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/j-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jade-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jade-mode";
+      ename = "jade-mode";
+      version = "1.0.1.0.20211019.161323";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/jade-mode-1.0.1.0.20211019.161323.tar";
+        sha256 = "11b7wkp3pszc90f04sq0jkb83vgjkx0hdv4fylv6q2hyxpfn08r2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/jade-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jinja2-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jinja2-mode";
+      ename = "jinja2-mode";
+      version = "0.3.0.20220117.80711";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/jinja2-mode-0.3.0.20220117.80711.tar";
+        sha256 = "05riwy4pn9i1jn5kr75hkb82n3jf0l3nsnzbwljbxvl362929x7m";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/jinja2-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  julia-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "julia-mode";
+      ename = "julia-mode";
+      version = "0.4.0.20240506.120530";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-0.4.0.20240506.120530.tar";
+        sha256 = "0kiwlc017bw8y2p166y2hpkpssml2rrx6p056qqn99ki5m682kav";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/julia-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  keycast = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "keycast";
+      ename = "keycast";
+      version = "1.4.0.0.20240713.191915";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.0.0.20240713.191915.tar";
+        sha256 = "13kmc4gif26mgwdvc6zid095i6qlyrhzbl3lv10hzli28n0jqqdm";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/keycast.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kotlin-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "kotlin-mode";
+      ename = "kotlin-mode";
+      version = "2.0.0.0.20230123.105957";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/kotlin-mode-2.0.0.0.20230123.105957.tar";
+        sha256 = "1jri3r3f6c09zf4x06a693r5izsdhijq2y279y764if2b3a8bwq2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/kotlin-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lorem-ipsum = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lorem-ipsum";
+      ename = "lorem-ipsum";
+      version = "0.4.0.20221214.105746";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/lorem-ipsum-0.4.0.20221214.105746.tar";
+        sha256 = "1wwynsvpcing7rrmacxrmnib044dajawbdqxhhcwniqrxyw883c0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/lorem-ipsum.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lua-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lua-mode";
+      ename = "lua-mode";
+      version = "20221027.0.20231023.94721";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/lua-mode-20221027.0.20231023.94721.tar";
+        sha256 = "1zlllyj2w8am1fv3iia8yrqhwsk2pi9kkw8ml6qc2lamfa09y65p";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/lua-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  macrostep = callPackage (
+    {
+      cl-lib ? null,
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "macrostep";
+      ename = "macrostep";
+      version = "0.9.4.0.20240608.12616";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20240608.12616.tar";
+        sha256 = "0wl8v174428vaxzf9ghyzm1ljsv0r5xw445lwzzj21yc4x1y2vh1";
+      };
+      packageRequires = [
+        cl-lib
+        compat
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/macrostep.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  magit = callPackage (
+    {
+      compat,
+      dash,
+      elpaBuild,
+      fetchurl,
+      git-commit,
+      lib,
+      magit-section,
+      seq,
+      transient,
+      with-editor,
+    }:
+    elpaBuild {
+      pname = "magit";
+      ename = "magit";
+      version = "3.3.0.50snapshot0.20240727.200453";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-3.3.0.50snapshot0.20240727.200453.tar";
+        sha256 = "1ba1wkw56h0srxvms02ifvvp817p6rs501grcaqkmi70cp73lvkp";
+      };
+      packageRequires = [
+        compat
+        dash
+        git-commit
+        magit-section
+        seq
+        transient
+        with-editor
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/magit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  magit-section = callPackage (
+    {
+      compat,
+      dash,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "magit-section";
+      ename = "magit-section";
+      version = "3.3.0.50snapshot0.20240727.200453";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/magit-section-3.3.0.50snapshot0.20240727.200453.tar";
+        sha256 = "1d16s26yzgzd9rz3jnvxj67aq5zn3hgsfksv4jb87vvnnfq2f7hk";
+      };
+      packageRequires = [
+        compat
+        dash
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/magit-section.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mastodon = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      persist,
+      request,
+    }:
+    elpaBuild {
+      pname = "mastodon";
+      ename = "mastodon";
+      version = "1.0.24.0.20240701.160422";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.24.0.20240701.160422.tar";
+        sha256 = "0h2q0wwlcsaz5ck8758l893spmg3hl6g4jpj7mgbc0qhv2bw1vzf";
+      };
+      packageRequires = [
+        persist
+        request
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/mastodon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  material-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "material-theme";
+      ename = "material-theme";
+      version = "2015.0.20210904.122621";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/material-theme-2015.0.20210904.122621.tar";
+        sha256 = "15wn2372p6zsbpbrvhd1lyyh736zhjzgw2fp62wpsyf8hncdmzb3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/material-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mentor = callPackage (
+    {
+      async,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+      url-scgi,
+      xml-rpc,
+    }:
+    elpaBuild {
+      pname = "mentor";
+      ename = "mentor";
+      version = "0.5.0.20231009.93430";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/mentor-0.5.0.20231009.93430.tar";
+        sha256 = "159ng3vq4swbn79im0nss5wddhn0hkd7fsrz4y6d71hbvx406bjz";
+      };
+      packageRequires = [
+        async
+        seq
+        url-scgi
+        xml-rpc
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/mentor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  meow = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "meow";
+      ename = "meow";
+      version = "1.4.5.0.20240712.182147";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240712.182147.tar";
+        sha256 = "1bq8aybbs0nfzinsw3l64naygsxpjvpckism0n8i3kyriq275pj8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/meow.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minibar = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minibar";
+      ename = "minibar";
+      version = "0.3.0.20230414.114052";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/minibar-0.3.0.20230414.114052.tar";
+        sha256 = "1qsz57bfbsq6d8p0wbvglbm3m7v6lsmvbg4hnmyxyinns98fwqig";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/minibar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  moe-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "moe-theme";
+      ename = "moe-theme";
+      version = "1.0.2.0.20240716.85432";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.0.2.0.20240716.85432.tar";
+        sha256 = "0xcqpdw7p6mphgrjl93cv25zj63r8bi1zi8jzd65k5s6sxlvz7bs";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/moe-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  monokai-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "monokai-theme";
+      ename = "monokai-theme";
+      version = "3.5.3.0.20240710.102754";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/monokai-theme-3.5.3.0.20240710.102754.tar";
+        sha256 = "0xncnb5fx7q55cl18gs6gw63di7p9kjyrfq7an5fig1rkmsyp4sx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/monokai-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mpv = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "mpv";
+      ename = "mpv";
+      version = "0.2.0.0.20220801.191738";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/mpv-0.2.0.0.20220801.191738.tar";
+        sha256 = "0fanxxgmpjmy13lawr15ccnlzc5k89pix6m020kxbpi6aj2n1apc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/mpv.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  multiple-cursors = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "multiple-cursors";
+      ename = "multiple-cursors";
+      version = "1.4.0.0.20240223.113445";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.4.0.0.20240223.113445.tar";
+        sha256 = "17wq8apfvcrmx4mvyw2pbkp9jg5c960w8j81blzxq1qxh1ggdv3z";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nasm-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nasm-mode";
+      ename = "nasm-mode";
+      version = "1.1.1.0.20240610.150504";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20240610.150504.tar";
+        sha256 = "1kkv7r6j02472d6c91xsrg9qlfvl70iyi538w2mh3s2adfkh7ps9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/nasm-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nginx-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nginx-mode";
+      ename = "nginx-mode";
+      version = "1.1.10.0.20240412.40234";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/nginx-mode-1.1.10.0.20240412.40234.tar";
+        sha256 = "1ni7bgbvgahdl0b0ki47av7i28059yyy2rld1wvdf2pkfk0r6cq1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/nginx-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nix-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "nix-mode";
+      ename = "nix-mode";
+      version = "1.5.0.0.20230421.153655";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/nix-mode-1.5.0.0.20230421.153655.tar";
+        sha256 = "186c1xng3phn3m4jvazn114l1ch1jldfyjaihb32rb9c8bf3mfr9";
+      };
+      packageRequires = [
+        magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/nix-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  oblivion-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "oblivion-theme";
+      ename = "oblivion-theme";
+      version = "0.1.0.20240320.115258";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/oblivion-theme-0.1.0.20240320.115258.tar";
+        sha256 = "1m0r9laf3wk7pmw5p46cwh0k05lqs1p5806c1czqrqq35z29flwh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/oblivion-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  opam-switch-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "opam-switch-mode";
+      ename = "opam-switch-mode";
+      version = "1.8snapshot0.20230802.91729";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode-1.8snapshot0.20230802.91729.tar";
+        sha256 = "01ccpzlanc42na9hdm8f8ys4b1lsxqx5f2ks3ya3f5yr580amy1w";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-auto-tangle = callPackage (
+    {
+      async,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-auto-tangle";
+      ename = "org-auto-tangle";
+      version = "0.6.0.0.20230201.195019";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-auto-tangle-0.6.0.0.20230201.195019.tar";
+        sha256 = "1895wp7fajpz4mddp4qr136h30rp3ashn3zdb6zdrb2qfa275rri";
+      };
+      packageRequires = [ async ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-auto-tangle.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-contrib = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-contrib";
+      ename = "org-contrib";
+      version = "0.4.2.0.20240518.90129";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.4.2.0.20240518.90129.tar";
+        sha256 = "0rkvdmff5fnjaziq14vwr4af0msq5lwzf4cyqrnyakh4dq7ffmpx";
+      };
+      packageRequires = [ org ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-contrib.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-drill = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org,
+      persist,
+      seq,
+    }:
+    elpaBuild {
+      pname = "org-drill";
+      ename = "org-drill";
+      version = "2.7.0.0.20210428.101221";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-drill-2.7.0.0.20210428.101221.tar";
+        sha256 = "1mib43crqgb45gwcy0kmk598f259l3wsycpzw4795xxfw1kj5z3y";
+      };
+      packageRequires = [
+        org
+        persist
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-drill.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-journal = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-journal";
+      ename = "org-journal";
+      version = "2.2.0.0.20240225.201950";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20240225.201950.tar";
+        sha256 = "013yyxalngcl55z0z23qgjz0gwgjp5px0hd2ykibflw2vlqkl97p";
+      };
+      packageRequires = [ org ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-journal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-mime = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-mime";
+      ename = "org-mime";
+      version = "0.3.2.0.20240129.232731";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.2.0.20240129.232731.tar";
+        sha256 = "1a9pjvn9w138b4417gkdvcjvw9d68pqx5g6sjplldf6z23p3d6bp";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-mime.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-present = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-present";
+      ename = "org-present";
+      version = "0.1.0.20220806.144744";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-present-0.1.0.20220806.144744.tar";
+        sha256 = "0k71hhl9gac0qvxmrjlf0cj60490m563ngbkr510vbkylri8rmdz";
+      };
+      packageRequires = [ org ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-present.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-superstar = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-superstar";
+      ename = "org-superstar";
+      version = "1.5.1.0.20230116.151025";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-superstar-1.5.1.0.20230116.151025.tar";
+        sha256 = "02f3lzb8k51rhf13a2warvhg8ib11wagw1zrfaknni7ssiwdj3x6";
+      };
+      packageRequires = [ org ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-superstar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-transclusion-http = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org-transclusion,
+      plz,
+    }:
+    elpaBuild {
+      pname = "org-transclusion-http";
+      ename = "org-transclusion-http";
+      version = "0.5pre0.20240630.140904";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http-0.5pre0.20240630.140904.tar";
+        sha256 = "1gkh5flmbj0gah8vbw6ghqagak220ljym8rsgpwmpxmqzwjhp5kp";
+      };
+      packageRequires = [
+        org-transclusion
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-tree-slide = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-tree-slide";
+      ename = "org-tree-slide";
+      version = "2.8.22.0.20230826.132200";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/org-tree-slide-2.8.22.0.20230826.132200.tar";
+        sha256 = "0hr237z10zpy3p37d0aa3dxcw61zqfpkip4z6h20kqvnclr65rx0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/org-tree-slide.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  orgit = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      magit,
+      org,
+    }:
+    elpaBuild {
+      pname = "orgit";
+      ename = "orgit";
+      version = "1.9.0.0.20240713.192819";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/orgit-1.9.0.0.20240713.192819.tar";
+        sha256 = "0gb73cyxhqi4cflnha9dzcnvs8l7nb3ksskq8psfdrs4h6ra3xhm";
+      };
+      packageRequires = [
+        compat
+        magit
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/orgit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  p4-16-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "p4-16-mode";
+      ename = "p4-16-mode";
+      version = "0.3.0.20231118.161633";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/p4-16-mode-0.3.0.20231118.161633.tar";
+        sha256 = "1fkpj2l3pd0vjrxl56jsg3ahkz2j1d48gghraq5ccdfalpmwmg75";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/p4-16-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  package-lint = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      let-alist,
+      lib,
+    }:
+    elpaBuild {
+      pname = "package-lint";
+      ename = "package-lint";
+      version = "0.23.0.20240516.73305";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.23.0.20240516.73305.tar";
+        sha256 = "1g1jinavkrlxnrpsjkfc8d9n9ag9y1svi0p8yqb4rswvjv0l6vll";
+      };
+      packageRequires = [ let-alist ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/package-lint.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pacmacs = callPackage (
+    {
+      dash,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pacmacs";
+      ename = "pacmacs";
+      version = "0.1.1.0.20220411.143014";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/pacmacs-0.1.1.0.20220411.143014.tar";
+        sha256 = "1h542y8hnqvkp7i8fd08rplamlivipa99mnxkzh8xkd8d19hn95k";
+      };
+      packageRequires = [ dash ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/pacmacs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  page-break-lines = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "page-break-lines";
+      ename = "page-break-lines";
+      version = "0.15.0.20240311.102621";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240311.102621.tar";
+        sha256 = "03bz8kr6mk7k9sfnai805kjfb7w4q45ba83k4vylwb8c1x5km32h";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/page-break-lines.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parseclj = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "parseclj";
+      ename = "parseclj";
+      version = "1.1.1.0.20231203.190509";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/parseclj-1.1.1.0.20231203.190509.tar";
+        sha256 = "1h0lfy17613s7ls55ca77nqmc87v3kdwz1cvymzf2jp4xckgcsvw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/parseclj.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parseedn = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      map,
+      parseclj,
+    }:
+    elpaBuild {
+      pname = "parseedn";
+      ename = "parseedn";
+      version = "1.2.1.0.20231203.190947";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/parseedn-1.2.1.0.20231203.190947.tar";
+        sha256 = "0l8w1qr2nqngpcdcw1052dpx8q69xyz20mr2vvqayr5jmsgbvaad";
+      };
+      packageRequires = [
+        map
+        parseclj
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/parseedn.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pcmpl-args = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pcmpl-args";
+      ename = "pcmpl-args";
+      version = "0.1.3.0.20220510.145627";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/pcmpl-args-0.1.3.0.20220510.145627.tar";
+        sha256 = "1j1imsxbmpbxwywpl399panwgh071f9bpz3s4yf0mzcb4slpyxsq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/pcmpl-args.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pcre2el = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pcre2el";
+      ename = "pcre2el";
+      version = "1.12.0.20240629.162214";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/pcre2el-1.12.0.20240629.162214.tar";
+        sha256 = "1lcpxjq2qzjk4xzl5ndshkfga4j1jy1i296h3kc3y20ksjml92x4";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/pcre2el.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pdf-tools = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      let-alist,
+      lib,
+      tablist,
+    }:
+    elpaBuild {
+      pname = "pdf-tools";
+      ename = "pdf-tools";
+      version = "1.1.0.0.20240429.40722";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/pdf-tools-1.1.0.0.20240429.40722.tar";
+        sha256 = "1799picrndkixcwhvvs0r1hkbjiw1hm2bq9wyj40ryx2a4y900n8";
+      };
+      packageRequires = [
+        let-alist
+        tablist
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/pdf-tools.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  php-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "php-mode";
+      ename = "php-mode";
+      version = "1.25.1.0.20240722.164315";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.25.1.0.20240722.164315.tar";
+        sha256 = "1fz4w8sbz59ylrag2kdv4wqjmvxj4dhi4q0bhslxa55vwgg2yfd6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/php-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  popon = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "popon";
+      ename = "popon";
+      version = "0.13.0.20230703.82713";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/popon-0.13.0.20230703.82713.tar";
+        sha256 = "10zlzlzjgmg29qmnk5skp1sf378wsavzpgpxx5590fy4gj5xwqbj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/popon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  popup = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "popup";
+      ename = "popup";
+      version = "0.5.9.0.20240721.5155";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20240721.5155.tar";
+        sha256 = "11ay4yknbc6dy7c08dcaz4sy1ly98m0ghchif0m2mm72s2hgw7g7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/popup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  projectile = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "projectile";
+      ename = "projectile";
+      version = "2.9.0snapshot0.20240212.110040";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240212.110040.tar";
+        sha256 = "0gbci7zwfwj8g69dla72arj3s5w49y6wgwcrilnlfmm3fc1h9lqy";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/projectile.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  proof-general = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "proof-general";
+      ename = "proof-general";
+      version = "4.6snapshot0.20240708.152546";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20240708.152546.tar";
+        sha256 = "1gc8g6gm0q7iirvgniv7fm3djlb651czr9iws0p41fvi4kq28b1r";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/proof-general.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  prop-menu = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "prop-menu";
+      ename = "prop-menu";
+      version = "0.1.2.0.20150728.51803";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/prop-menu-0.1.2.0.20150728.51803.tar";
+        sha256 = "04qvjlq0kra1j3all8mh5appbpwwc2pkzkjrpwdsa85hkd18ls38";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/prop-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  racket-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "racket-mode";
+      ename = "racket-mode";
+      version = "1.0.20240718.150548";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240718.150548.tar";
+        sha256 = "1kp29m0cjsq9hfy73z9rgzvl8c8ag4mb49hkh5y6w6f8pjv36va7";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/racket-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rainbow-delimiters = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rainbow-delimiters";
+      ename = "rainbow-delimiters";
+      version = "2.1.5.0.20230830.160022";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/rainbow-delimiters-2.1.5.0.20230830.160022.tar";
+        sha256 = "1nkc02b6agkcig5gfc7rh4k203q67ss11l0yxr1fa83w7jd0gdkk";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/rainbow-delimiters.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  raku-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "raku-mode";
+      ename = "raku-mode";
+      version = "0.2.1.0.20240429.100744";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/raku-mode-0.2.1.0.20240429.100744.tar";
+        sha256 = "0nz5gp98m5cl6l0agk2chz7llqldzkl7swkcmka5i4r1m7qx39rr";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/raku-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  recomplete = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "recomplete";
+      ename = "recomplete";
+      version = "0.2.0.20240616.234552";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20240616.234552.tar";
+        sha256 = "0gkd3g1p6i4l7s6gqjsdj20m3y8n75wlcfw6xii0ka7n8j8dmrz4";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/recomplete.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  reformatter = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "reformatter";
+      ename = "reformatter";
+      version = "0.8.0.20240515.204925";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20240515.204925.tar";
+        sha256 = "1iq4a99fxaaq2k0q9rfsprxx21sam8cpn455jddpcdcl71flbd72";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/reformatter.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  request = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "request";
+      ename = "request";
+      version = "0.3.3.0.20230126.231738";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/request-0.3.3.0.20230126.231738.tar";
+        sha256 = "1fsyi1g65am1ln72hmxi216g95l29v9xdx9hrhky7i3j96fflnf6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/request.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rfc-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rfc-mode";
+      ename = "rfc-mode";
+      version = "1.4.2.0.20231013.135347";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/rfc-mode-1.4.2.0.20231013.135347.tar";
+        sha256 = "0jp5xamraan313nsgy8w7c91jjvqrxphzsm2wg8sgnj00zpr3jfb";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/rfc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rubocop = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rubocop";
+      ename = "rubocop";
+      version = "0.7.0snapshot0.20210309.124149";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/rubocop-0.7.0snapshot0.20210309.124149.tar";
+        sha256 = "110rfww9kl2f8mj45nf1irwmwj4bfgla6glc52dhqi2ibvpik1h5";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/rubocop.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rust-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rust-mode";
+      ename = "rust-mode";
+      version = "1.0.5.0.20240520.74946";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.5.0.20240520.74946.tar";
+        sha256 = "0k64mr7z18rf1w8fn83ajsbdghc9i8qf6lmc2wyckif8cwj3f9fa";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/rust-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sass-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      haml-mode,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sass-mode";
+      ename = "sass-mode";
+      version = "3.0.16.0.20190502.5315";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/sass-mode-3.0.16.0.20190502.5315.tar";
+        sha256 = "1699icjrlliwr949g3933614idyzvk8g9srl346g0s9jfd2llxb8";
+      };
+      packageRequires = [
+        cl-lib
+        haml-mode
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/sass-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scad-mode = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scad-mode";
+      ename = "scad-mode";
+      version = "94.0.0.20240708.212011";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240708.212011.tar";
+        sha256 = "01jyhpqqskizsclvxzii1kv20iklb8y01hglhhavrddf1dri7jza";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/scad-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scala-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scala-mode";
+      ename = "scala-mode";
+      version = "1.1.0.0.20240729.42046";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/scala-mode-1.1.0.0.20240729.42046.tar";
+        sha256 = "0981n96zx633iypwyz2f6af7r1lzx0lick7zv0azqglrwgnly35r";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/scala-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scroll-on-drag = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scroll-on-drag";
+      ename = "scroll-on-drag";
+      version = "0.1.0.20240421.80350";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-drag-0.1.0.20240421.80350.tar";
+        sha256 = "0yvz2349ii06r69q2a40qw7grxviqfj9bpm36pjb7wzc46bywl23";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/scroll-on-drag.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scroll-on-jump = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scroll-on-jump";
+      ename = "scroll-on-jump";
+      version = "0.2.0.20240421.90558";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump-0.2.0.20240421.90558.tar";
+        sha256 = "0wfdq7myzywqq1nl5f0mz43xiqmpl8vq3p87z7222szi0mm9r6ra";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sesman = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sesman";
+      ename = "sesman";
+      version = "0.3.3snapshot0.20240417.172323";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/sesman-0.3.3snapshot0.20240417.172323.tar";
+        sha256 = "1d4c3ymxas4xsjbkg7yj80x6lgly5rch7fvyvi495yvk3mzd9yzk";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/sesman.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shellcop = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shellcop";
+      ename = "shellcop";
+      version = "0.1.0.0.20220728.132914";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/shellcop-0.1.0.0.20220728.132914.tar";
+        sha256 = "0jdh00gw99gm33sviqp9rba6551qpp7pmdfdjd8gqzfk3ziwfdw0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/shellcop.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  slime = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      macrostep,
+    }:
+    elpaBuild {
+      pname = "slime";
+      ename = "slime";
+      version = "2.30snapshot0.20240705.225542";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240705.225542.tar";
+        sha256 = "1rl0zpip9qpkcb5hqj3xbamrarmcvpjxhnbms9kzqay3xws5i214";
+      };
+      packageRequires = [ macrostep ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/slime.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sly = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sly";
+      ename = "sly";
+      version = "1.0.43.0.20240501.111815";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240501.111815.tar";
+        sha256 = "0zpcad35ig5ci2a4rd9v3146c12mj7c9zhafwxvbmjhzd5aqfv82";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/sly.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  smartparens = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "smartparens";
+      ename = "smartparens";
+      version = "1.11.0.0.20240713.100215";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/smartparens-1.11.0.0.20240713.100215.tar";
+        sha256 = "0479n363cz4izdxdl2420fcmngbfjp7a5xv9xlxyab62aph63f0w";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/smartparens.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  solarized-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "solarized-theme";
+      ename = "solarized-theme";
+      version = "2.0.1.0.20240725.161711";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.1.0.20240725.161711.tar";
+        sha256 = "1d3m6h00awq2az6vkal631k9l1jpqm2qxr1067rzd1q2qdlaf2ji";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/solarized-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spacemacs-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spacemacs-theme";
+      ename = "spacemacs-theme";
+      version = "0.2.0.20240715.144003";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240715.144003.tar";
+        sha256 = "14d22bdm33jbwv9dphqydgww93scqdfbkjg80iivb48s0br86qld";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spell-fu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spell-fu";
+      ename = "spell-fu";
+      version = "0.3.0.20240616.234552";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20240616.234552.tar";
+        sha256 = "1dnyz5dm2p6nj8imqpmz23n2j368ygnff4z6f90vl6g52pv07d9r";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/spell-fu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sqlite3 = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sqlite3";
+      ename = "sqlite3";
+      version = "0.17.0.20231124.132621";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/sqlite3-0.17.0.20231124.132621.tar";
+        sha256 = "10mgf69dvvglf067n59w3dy08jc245rhbqqjbfr27ff9xjrklvfh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/sqlite3.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  stylus-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "stylus-mode";
+      ename = "stylus-mode";
+      version = "1.0.1.0.20211019.161323";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/stylus-mode-1.0.1.0.20211019.161323.tar";
+        sha256 = "17hnlylbmk0a3sdcz61crj3ky8224jawlsdzqcvhjbnbmnflvd3z";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/stylus-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  subatomic-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "subatomic-theme";
+      ename = "subatomic-theme";
+      version = "1.8.2.0.20220128.161518";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/subatomic-theme-1.8.2.0.20220128.161518.tar";
+        sha256 = "1h4rr2g6lhn186df2nk026xk1x6yhh441d6mjcdrfkii17n15552";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/subatomic-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  subed = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "subed";
+      ename = "subed";
+      version = "1.2.14.0.20240724.164835";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.14.0.20240724.164835.tar";
+        sha256 = "153rx77g6v6klyb4y3r322lbd7s1ympkya3sj04gvz3ka5d7znf3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/subed.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sweeprolog = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sweeprolog";
+      ename = "sweeprolog";
+      version = "0.27.5.0.20240411.60241";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.5.0.20240411.60241.tar";
+        sha256 = "03diw4psd0chk3l6vd3fm1y99xby9b77nnd48jlxa06dgdx3jan9";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/sweeprolog.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  swift-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "swift-mode";
+      ename = "swift-mode";
+      version = "9.1.0.0.20240622.93531";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.1.0.0.20240622.93531.tar";
+        sha256 = "0b4x4p8iypmmqw0yn4c683rbvkn5n7nccr9pjnn89yx93d4pab0y";
+      };
+      packageRequires = [ seq ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/swift-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  symbol-overlay = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "symbol-overlay";
+      ename = "symbol-overlay";
+      version = "4.1.0.20240311.120733";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.1.0.20240311.120733.tar";
+        sha256 = "0q4jj92l2xj5lj6hbxx42flrx4x923jidqmvkqq3japc2gvp8g00";
+      };
+      packageRequires = [ seq ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  systemd = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "systemd";
+      ename = "systemd";
+      version = "1.6.1.0.20230131.220207";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/systemd-1.6.1.0.20230131.220207.tar";
+        sha256 = "0q7yz96vp1p424whfap7iaxbxa7ydj50v32y3q85lwicfy5838gj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/systemd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tablist = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tablist";
+      ename = "tablist";
+      version = "1.0.0.20200427.220558";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/tablist-1.0.0.20200427.220558.tar";
+        sha256 = "12wfryycv3vrrmwj41r8l3rc0w0dy4b7ay0a86q5kah22az38q4x";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/tablist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tangotango-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tangotango-theme";
+      ename = "tangotango-theme";
+      version = "0.0.7.0.20240522.132740";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme-0.0.7.0.20240522.132740.tar";
+        sha256 = "1psr1amscknyw41dmsw6mvy73v271l8mzibwhl6kfp41a97cnlki";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  telephone-line = callPackage (
+    {
+      cl-generic,
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "telephone-line";
+      ename = "telephone-line";
+      version = "0.5.0.20240109.152108";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/telephone-line-0.5.0.20240109.152108.tar";
+        sha256 = "18sgw1q80wxi38n815rv70146yiwr2dq5c1a7saabs1y6zmq3fdq";
+      };
+      packageRequires = [
+        cl-generic
+        cl-lib
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/telephone-line.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  testcover-mark-line = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "testcover-mark-line";
+      ename = "testcover-mark-line";
+      version = "0.3.0.20221128.191350";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/testcover-mark-line-0.3.0.20221128.191350.tar";
+        sha256 = "1199bd15bxyb661b74nqixq9f39j87lijw105il0fslc3dw7hi5n";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/testcover-mark-line.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  textile-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "textile-mode";
+      ename = "textile-mode";
+      version = "1.0.0.0.20240212.175553";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/textile-mode-1.0.0.0.20240212.175553.tar";
+        sha256 = "1kiy4zh7x79igi8x872rjmliik1m0iyfkwng2i64llqf3yiasmwj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/textile-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  toc-org = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "toc-org";
+      ename = "toc-org";
+      version = "1.1.0.20230831.75249";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/toc-org-1.1.0.20230831.75249.tar";
+        sha256 = "1kscz2s87l8a8w0d4s3g8ilspd63p0ij2vgncvzvb8hjld4pdcfh";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/toc-org.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  totp-auth = callPackage (
+    {
+      base32,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "totp-auth";
+      ename = "totp-auth";
+      version = "1.0.0.20240227.184114";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/totp-auth-1.0.0.20240227.184114.tar";
+        sha256 = "1yqvn30qc1vdhshcss4znzily08rbv77mf8hrhmy5zayq4n23nca";
+      };
+      packageRequires = [ base32 ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/totp-auth.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  treesit-fold = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "treesit-fold";
+      ename = "treesit-fold";
+      version = "0.1.0.0.20240630.204821";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.1.0.0.20240630.204821.tar";
+        sha256 = "1h99gh11xhmzs7ix94y609sijdchz692ixkxxsmnxbrniybpfcsv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/treesit-fold.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  treeview = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "treeview";
+      ename = "treeview";
+      version = "1.2.0.0.20230728.234322";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/treeview-1.2.0.0.20230728.234322.tar";
+        sha256 = "0cf64zj3iv1qzzddr5hg9rsjilczfn2c84dcgpfny7l3wzqrmwl1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/treeview.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tuareg = callPackage (
+    {
+      caml,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tuareg";
+      ename = "tuareg";
+      version = "3.0.2snapshot0.20231009.174342";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.0.2snapshot0.20231009.174342.tar";
+        sha256 = "10ijh4h8srm810b74jb0bqb8zxca91bsbhlb85fyyscbsvhms2f1";
+      };
+      packageRequires = [ caml ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/tuareg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  typescript-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "typescript-mode";
+      ename = "typescript-mode";
+      version = "0.4.0.20240603.115709";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20240603.115709.tar";
+        sha256 = "0v00kk4035i7b4b7clcwqxiavz89l2zxfpgk7f773ymamxpr3g82";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/typescript-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ujelly-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ujelly-theme";
+      ename = "ujelly-theme";
+      version = "1.2.9.0.20180214.162459";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme-1.2.9.0.20180214.162459.tar";
+        sha256 = "1frl87liqd9wdd6i1wwi94qzbwdx24p5shr90flrnpj6hs2yx1n3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  undo-fu = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "undo-fu";
+      ename = "undo-fu";
+      version = "0.5.0.20240707.141050";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-0.5.0.20240707.141050.tar";
+        sha256 = "0glgy1manfv9rykkxhafc969mhazd119zgrkm5fg9shcyb7q629a";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/undo-fu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  undo-fu-session = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "undo-fu-session";
+      ename = "undo-fu-session";
+      version = "0.7.0.20240713.142701";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session-0.7.0.20240713.142701.tar";
+        sha256 = "1c70cvf9f1x96l8gxfl4qpljwsqsqjcn745srsf9w9mcz520fyaa";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-fossil = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-fossil";
+      ename = "vc-fossil";
+      version = "20230504.0.20230504.162626";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/vc-fossil-20230504.0.20230504.162626.tar";
+        sha256 = "1w6vi3cflbyrw6109s0w4dbr0axid1abi3s2jvgjikjcggxwrk5f";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/vc-fossil.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vcomplete = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vcomplete";
+      ename = "vcomplete";
+      version = "2.0.0.20230227.132830";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/vcomplete-2.0.0.20230227.132830.tar";
+        sha256 = "0klfc9x2wn91q1v3056hv5kmyzpl1jkigsdw9yjf9623z2fa1s5v";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/vcomplete.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  visual-fill-column = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "visual-fill-column";
+      ename = "visual-fill-column";
+      version = "2.6.3.0.20240411.65626";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20240411.65626.tar";
+        sha256 = "0hyhxpqj39say3w9rpw3mhx7r9aici1wfsrr9631bnc0249qylj2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vm = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "vm";
+      ename = "vm";
+      version = "8.3.0snapshot0.20240724.160938";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240724.160938.tar";
+        sha256 = "14xcgbi52dbs3kiqci810l7hjvxln00ifib21d6hisx0lhs5743l";
+      };
+      packageRequires = [
+        cl-lib
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/vm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  web-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "web-mode";
+      ename = "web-mode";
+      version = "17.3.19.0.20240413.145507";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.19.0.20240413.145507.tar";
+        sha256 = "1vx54jl4r0nw3bpdphn206ia7x4a0pf8sdfsh46qx4jva5mgvg6j";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/web-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  webpaste = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+      request,
+    }:
+    elpaBuild {
+      pname = "webpaste";
+      ename = "webpaste";
+      version = "3.2.2.0.20240306.62647";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20240306.62647.tar";
+        sha256 = "1iw744ncnfq8mhr5r1v09n14nvf26bhvja7fqwjsw5ainhfxzw6y";
+      };
+      packageRequires = [
+        cl-lib
+        request
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/webpaste.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wfnames = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wfnames";
+      ename = "wfnames";
+      version = "1.2.0.20240418.100527";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20240418.100527.tar";
+        sha256 = "112m3y96bdsk75vza4lh9lgdcnv35c3iqgidkgpynsgxil4njshj";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/wfnames.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wgrep = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wgrep";
+      ename = "wgrep";
+      version = "3.0.0.0.20231216.120954";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/wgrep-3.0.0.0.20231216.120954.tar";
+        sha256 = "1qadyl29a70d9m5z32s0r18rjxg0jdmbpjr47zgvppl807mfni85";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/wgrep.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  why-this = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "why-this";
+      ename = "why-this";
+      version = "2.0.4.0.20221129.81751";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/why-this-2.0.4.0.20221129.81751.tar";
+        sha256 = "1qvywhi3nibq1sr8fc1msnnjrdf70j308bp69sl9cirsd61p62bw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/why-this.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  with-editor = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "with-editor";
+      ename = "with-editor";
+      version = "3.4.0.0.20240725.142901";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.0.0.20240725.142901.tar";
+        sha256 = "076a9gs6d298fvhk5sl2pf520pvknswcgbb6v7cwqhczcqj6wncm";
+      };
+      packageRequires = [ compat ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/with-editor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  with-simulated-input = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "with-simulated-input";
+      ename = "with-simulated-input";
+      version = "3.0.0.20210602.224623";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/with-simulated-input-3.0.0.20210602.224623.tar";
+        sha256 = "17rshlrz09kxzqb2z54xhmqz2kjj717jkw4bv1inz3vvxi25ndca";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/with-simulated-input.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  workroom = callPackage (
+    {
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "workroom";
+      ename = "workroom";
+      version = "2.3.1.0.20230926.163128";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/workroom-2.3.1.0.20230926.163128.tar";
+        sha256 = "0jmjck89xrsv9l386aayirnbb2ambkfria3jirp09zz7fx582936";
+      };
+      packageRequires = [
+        compat
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/workroom.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  writegood-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "writegood-mode";
+      ename = "writegood-mode";
+      version = "2.2.0.0.20220511.170949";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/writegood-mode-2.2.0.0.20220511.170949.tar";
+        sha256 = "06rx9ak2wfcnd81a9hj310m22r7gpc2fnpy0hn1qcrfalsnp2kf1";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/writegood-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ws-butler = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ws-butler";
+      ename = "ws-butler";
+      version = "0.6.0.20201117.102839";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/ws-butler-0.6.0.20201117.102839.tar";
+        sha256 = "0k1dwxw22ar3837i05a17pr52nzxjdcs1fldwlq0b5xynjfj2i3k";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/ws-butler.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xah-fly-keys = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xah-fly-keys";
+      ename = "xah-fly-keys";
+      version = "25.9.20240725161125.0.20240725.161208";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-25.9.20240725161125.0.20240725.161208.tar";
+        sha256 = "06pvcbwj7b7h7nbv223yfjrxanf25s6rm3fq09zwmphwyy3ldlaw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xkcd = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      json ? null,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xkcd";
+      ename = "xkcd";
+      version = "1.1.0.20220503.110939";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/xkcd-1.1.0.20220503.110939.tar";
+        sha256 = "1rn5g8m1zd6jajasq4mi3jq1jgk8xw2jykzwd0hjmaz77psqb6af";
+      };
+      packageRequires = [ json ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/xkcd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xml-rpc = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xml-rpc";
+      ename = "xml-rpc";
+      version = "1.6.17.0.20231009.103222";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/xml-rpc-1.6.17.0.20231009.103222.tar";
+        sha256 = "19invp04068pzyjbbbscc7vlqh76r8n3f9d4mxacbvi5bhvrc2p0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/xml-rpc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yaml-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "yaml-mode";
+      ename = "yaml-mode";
+      version = "0.0.16.0.20240317.160205";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20240317.160205.tar";
+        sha256 = "08k4bygryrv0byczs6v06bm18m654fc070jjx85d3a2fxr9dh9a9";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/yaml-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yasnippet-snippets = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      yasnippet,
+    }:
+    elpaBuild {
+      pname = "yasnippet-snippets";
+      ename = "yasnippet-snippets";
+      version = "1.0.0.20240603.75736";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240603.75736.tar";
+        sha256 = "0nw30a4ilgm65ic97vsvxjj6bw4p27mblrlymwnsg8hm7rnxmnwy";
+      };
+      packageRequires = [ yasnippet ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zenburn-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "zenburn-theme";
+      ename = "zenburn-theme";
+      version = "2.9.0snapshot0.20240612.125832";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0snapshot0.20240612.125832.tar";
+        sha256 = "1wgpb9x591z28gy7cm8i45qxl7srhj6sgcpnbzi303rbh90rd4sg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zig-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      reformatter,
+    }:
+    elpaBuild {
+      pname = "zig-mode";
+      ename = "zig-mode";
+      version = "0.0.8.0.20240507.233944";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20240507.233944.tar";
+        sha256 = "1skx0if2ac40csgsrfvkd73ydsvr24ijkmqrpya65n67388gibfv";
+      };
+      packageRequires = [ reformatter ];
+      meta = {
+        homepage = "https://elpa.nongnu.org/nongnu-devel/zig-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix
new file mode 100644
index 0000000000000..01bca0ff1f8a1
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix
@@ -0,0 +1,45 @@
+/*
+  # Updating
+
+  To update the list of packages from nongnu devel (ELPA),
+
+  1. Run `./update-nongnu-devel`.
+  2. Check for evaluation errors:
+       # "../../../../../" points to the default.nix from root of Nixpkgs tree
+       env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.nongnuDevelPackages
+  3. Run `git commit -m "nongnu-devel-packages $(date -Idate)" -- nongnu-devel-generated.nix`
+*/
+
+{ lib, buildPackages }:
+
+self:
+let
+
+  generateNongnu = lib.makeOverridable (
+    {
+      generated ? ./nongnu-devel-generated.nix,
+    }:
+    let
+
+      imported = import generated {
+        callPackage =
+          pkgs: args:
+          self.callPackage pkgs (
+            args
+            // {
+              # Use custom elpa url fetcher with fallback/uncompress
+              fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
+            }
+          );
+      };
+
+      super = imported;
+
+      overrides = { };
+
+    in
+    super // overrides
+  );
+
+in
+generateNongnu { }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index b5d9a11e764f3..1534ee9c4c3e9 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -1,3773 +1,5591 @@
 { callPackage }:
-  {
-    adoc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "adoc-mode";
-        ename = "adoc-mode";
-        version = "0.7.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar";
-          sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/adoc-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    afternoon-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "afternoon-theme";
-        ename = "afternoon-theme";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar";
-          sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/afternoon-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    alect-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "alect-themes";
-        ename = "alect-themes";
-        version = "0.10";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar";
-          sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/alect-themes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ample-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ample-theme";
-        ename = "ample-theme";
-        version = "0.3.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/ample-theme-0.3.0.tar";
-          sha256 = "12z8z6da1xfc642w2wc82sjlfj3ymlz3jwrg3ydc2fapis2d3ibi";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ample-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    annotate = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "annotate";
-        ename = "annotate";
-        version = "2.2.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar";
-          sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/annotate.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "anti-zenburn-theme";
-        ename = "anti-zenburn-theme";
-        version = "2.5.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme-2.5.1.tar";
-          sha256 = "121038d6mjdfis1c5v9277bd6kz656n0c25daxq85mfswvjlar0i";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/anti-zenburn-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    anzu = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "anzu";
-        ename = "anzu";
-        version = "0.64";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar";
-          sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/anzu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    apache-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "apache-mode";
-        ename = "apache-mode";
-        version = "2.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar";
-          sha256 = "10fgbgww7j60dik7b7mvnm1zwgv9y8p5wzggkrdk50dv3gjfxg8f";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/apache-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    apropospriate-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "apropospriate-theme";
-        ename = "apropospriate-theme";
-        version = "0.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.2.0.tar";
-          sha256 = "1hsv26iqr0g6c3gy1df2qkd3ilwq6xaa89ch7pqh64737qrlw9db";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/apropospriate-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    arduino-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, spinner }:
-      elpaBuild {
-        pname = "arduino-mode";
-        ename = "arduino-mode";
-        version = "1.3.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar";
-          sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y";
-        };
-        packageRequires = [ emacs spinner ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/arduino-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    auto-dim-other-buffers = callPackage ({ elpaBuild
-                                          , fetchurl
-                                          , lib }:
-      elpaBuild {
-        pname = "auto-dim-other-buffers";
-        ename = "auto-dim-other-buffers";
-        version = "2.1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar";
-          sha256 = "0rgf0q66kdw9ind5bi01ydk84rclcd3kmlfzm9rfb429xnhqfzw8";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "autothemer";
-        ename = "autothemer";
-        version = "0.2.18";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar";
-          sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/autothemer.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    base32 = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "base32";
-        ename = "base32";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar";
-          sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/base32.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bash-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bash-completion";
-        ename = "bash-completion";
-        version = "3.1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar";
-          sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bash-completion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    beancount = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "beancount";
-        ename = "beancount";
-        version = "0.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/beancount-0.9.tar";
-          sha256 = "1s0w17mq8kilkrd33pan78px6mz5z96d7gvdmy2shg3hvj1jbq09";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/beancount.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "better-jumper";
-        ename = "better-jumper";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar";
-          sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/better-jumper.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bind-map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "bind-map";
-        ename = "bind-map";
-        version = "1.1.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar";
-          sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bind-map.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    bison-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "bison-mode";
-        ename = "bison-mode";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar";
-          sha256 = "0k0h96bpcndi3m9fdk74j0ynm50n6by508mv3ds9ala26dpdr7qa";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/bison-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    blow = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "blow";
-        ename = "blow";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar";
-          sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/blow.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    blueprint-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "blueprint-ts-mode";
-        ename = "blueprint-ts-mode";
-        version = "0.0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar";
-          sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "boxquote";
-        ename = "boxquote";
-        version = "2.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";
-          sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/boxquote.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    buttercup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "buttercup";
-        ename = "buttercup";
-        version = "1.35";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar";
-          sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/buttercup.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    camera = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "camera";
-        ename = "camera";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar";
-          sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/camera.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "caml";
-        ename = "caml";
-        version = "4.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar";
-          sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/caml.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cdlatex = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cdlatex";
-        ename = "cdlatex";
-        version = "4.18.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar";
-          sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cdlatex.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cider = callPackage ({ clojure-mode
-                         , elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib
-                         , parseedn
-                         , queue
-                         , seq
-                         , sesman
-                         , spinner
-                         , transient }:
-      elpaBuild {
-        pname = "cider";
-        ename = "cider";
-        version = "1.15.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar";
-          sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6";
-        };
-        packageRequires = [
-          clojure-mode
-          emacs
-          parseedn
-          queue
-          seq
-          sesman
-          spinner
-          transient
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cider.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    clojure-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "clojure-mode";
-        ename = "clojure-mode";
-        version = "5.19.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
-          sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/clojure-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    clojure-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "clojure-ts-mode";
-        ename = "clojure-ts-mode";
-        version = "0.2.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar";
-          sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/clojure-ts-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    coffee-mode = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "coffee-mode";
-        ename = "coffee-mode";
-        version = "0.6.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar";
-          sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    color-theme-tangotango = callPackage ({ color-theme
-                                          , elpaBuild
-                                          , fetchurl
-                                          , lib }:
-      elpaBuild {
-        pname = "color-theme-tangotango";
-        ename = "color-theme-tangotango";
-        version = "0.0.6";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/color-theme-tangotango-0.0.6.tar";
-          sha256 = "0lfr3xg9xvfjb12kcw80d35a1ayn4f5w1dkd2b0kx0wxkq0bykim";
-        };
-        packageRequires = [ color-theme ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/color-theme-tangotango.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    consult-flycheck = callPackage ({ consult
-                                    , elpaBuild
-                                    , emacs
-                                    , fetchurl
-                                    , flycheck
-                                    , lib }:
-      elpaBuild {
-        pname = "consult-flycheck";
-        ename = "consult-flycheck";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.0.tar";
-          sha256 = "17kc7v50zq69l4803nh8sjnqwi59p09wjzqkwka6g4dapya3h2xy";
-        };
-        packageRequires = [ consult emacs flycheck ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/consult-flycheck.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    corfu-terminal = callPackage ({ corfu
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , popon }:
-      elpaBuild {
-        pname = "corfu-terminal";
-        ename = "corfu-terminal";
-        version = "0.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.7.tar";
-          sha256 = "0a41hfma4iiinq2cgvwqqwxhrwjn5c7igl5sgvgx0mbjki2n6sll";
-        };
-        packageRequires = [ corfu emacs popon ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/corfu-terminal.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    crux = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "crux";
-        ename = "crux";
-        version = "0.5.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar";
-          sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/crux.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    csv2ledger = callPackage ({ csv-mode, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "csv2ledger";
-        ename = "csv2ledger";
-        version = "1.5.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar";
-          sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls";
-        };
-        packageRequires = [ csv-mode emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/csv2ledger.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cyberpunk-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "cyberpunk-theme";
-        ename = "cyberpunk-theme";
-        version = "1.22";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cyberpunk-theme-1.22.tar";
-          sha256 = "1kgkgpb07d4kh2rf88pfgyji42qv80443i67nzha2fx01zbd5swb";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cyberpunk-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    cycle-at-point = callPackage ({ elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , recomplete }:
-      elpaBuild {
-        pname = "cycle-at-point";
-        ename = "cycle-at-point";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar";
-          sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z";
-        };
-        packageRequires = [ emacs recomplete ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/cycle-at-point.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "d-mode";
-        ename = "d-mode";
-        version = "202003130913";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar";
-          sha256 = "0sdyk8q1pfk5gbj5hdyc1djmyb02vvhs4s2fbbxk52nlkx95p46s";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/d-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dart-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dart-mode";
-        ename = "dart-mode";
-        version = "1.0.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar";
-          sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dart-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    denote-refs = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "denote-refs";
-        ename = "denote-refs";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar";
-          sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0";
-        };
-        packageRequires = [ denote emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/denote-refs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    devhelp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "devhelp";
-        ename = "devhelp";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar";
-          sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/devhelp.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    devil = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "devil";
-        ename = "devil";
-        version = "0.6.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar";
-          sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/devil.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    diff-ansi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "diff-ansi";
-        ename = "diff-ansi";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar";
-          sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/diff-ansi.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    doc-show-inline = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "doc-show-inline";
-        ename = "doc-show-inline";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar";
-          sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/doc-show-inline.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dockerfile-mode";
-        ename = "dockerfile-mode";
-        version = "1.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar";
-          sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dracula-theme";
-        ename = "dracula-theme";
-        version = "1.8.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar";
-          sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dracula-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    drupal-mode = callPackage ({ elpaBuild, fetchurl, lib, php-mode }:
-      elpaBuild {
-        pname = "drupal-mode";
-        ename = "drupal-mode";
-        version = "0.7.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar";
-          sha256 = "1wr05pi5sm994cdzj329gr1lwxvq4w9wmc806izxq3fjifx0m609";
-        };
-        packageRequires = [ php-mode ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/drupal-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    dslide = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "dslide";
-        ename = "dslide";
-        version = "0.5.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
-          sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/dslide.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    eat = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "eat";
-        ename = "eat";
-        version = "0.9.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar";
-          sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/eat.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    edit-indirect = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "edit-indirect";
-        ename = "edit-indirect";
-        version = "0.1.13";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar";
-          sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/edit-indirect.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    editorconfig = callPackage ({ elpaBuild, emacs, fetchurl, lib, nadvice }:
-      elpaBuild {
-        pname = "editorconfig";
-        ename = "editorconfig";
-        version = "0.11.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar";
-          sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv";
-        };
-        packageRequires = [ emacs nadvice ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/editorconfig.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    elixir-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "elixir-mode";
-        ename = "elixir-mode";
-        version = "2.5.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar";
-          sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/elixir-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    elpher = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "elpher";
-        ename = "elpher";
-        version = "3.6.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
-          sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/elpher.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    engine-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "engine-mode";
-        ename = "engine-mode";
-        version = "2.2.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar";
-          sha256 = "0gp1mnf0yaq4w91pj989dzlxpbpcqqj0yls23wf2ly53kbaarzv9";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/engine-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil";
-        ename = "evil";
-        version = "1.15.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar";
-          sha256 = "0ciglddlq0z91jyggp86d9g3gwfzjp55xhldqpxpq39a2xkwqh0q";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-anzu = callPackage ({ anzu, elpaBuild, evil, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-anzu";
-        ename = "evil-anzu";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-anzu-0.2.tar";
-          sha256 = "1vn61aj0bnvkj2l3cd8m8q3n7kn09hdp6d13wc58w9pw8nrg0vq5";
-        };
-        packageRequires = [ anzu evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-anzu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-args = callPackage ({ elpaBuild, evil, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-args";
-        ename = "evil-args";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar";
-          sha256 = "0fv30wny2f4mg8l9jrjgxisz6nbmn84980yszbrcbkqi81dzzlyi";
-        };
-        packageRequires = [ evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-args.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-escape = callPackage ({ cl-lib ? null
-                               , elpaBuild
-                               , emacs
-                               , evil
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "evil-escape";
-        ename = "evil-escape";
-        version = "3.16";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-escape-3.16.tar";
-          sha256 = "0vv6k3zaaw4ckk6qjiw1n41815w1g4qgy2hfgsj1vm7xc9i9zjzp";
-        };
-        packageRequires = [ cl-lib emacs evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-escape.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-exchange = callPackage ({ cl-lib ? null
-                                 , elpaBuild
-                                 , evil
-                                 , fetchurl
-                                 , lib }:
-      elpaBuild {
-        pname = "evil-exchange";
-        ename = "evil-exchange";
-        version = "0.41";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-exchange-0.41.tar";
-          sha256 = "1yk7zdxl7c8c2ic37l0rsaynnpcrhdbblk2frl5m8phf54g82d8i";
-        };
-        packageRequires = [ cl-lib evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-exchange.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-goggles = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-goggles";
-        ename = "evil-goggles";
-        version = "0.0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar";
-          sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch";
-        };
-        packageRequires = [ emacs evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-goggles.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-iedit-state = callPackage ({ elpaBuild, evil, fetchurl, iedit, lib }:
-      elpaBuild {
-        pname = "evil-iedit-state";
-        ename = "evil-iedit-state";
-        version = "1.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar";
-          sha256 = "1955bci018rpbdvixlw0gxay10g0vgg2xwsfmfyxcblk5glrv5cp";
-        };
-        packageRequires = [ evil iedit ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-indent-plus = callPackage ({ cl-lib ? null
-                                    , elpaBuild
-                                    , evil
-                                    , fetchurl
-                                    , lib }:
-      elpaBuild {
-        pname = "evil-indent-plus";
-        ename = "evil-indent-plus";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-indent-plus-1.0.1.tar";
-          sha256 = "1kzlvi8xgfxy26w1m31nyh6vrq787vchkmk4r1xaphk9wn9bw1pq";
-        };
-        packageRequires = [ cl-lib evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-indent-plus.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-lisp-state = callPackage ({ bind-map
-                                   , elpaBuild
-                                   , evil
-                                   , fetchurl
-                                   , lib
-                                   , smartparens }:
-      elpaBuild {
-        pname = "evil-lisp-state";
-        ename = "evil-lisp-state";
-        version = "8.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-lisp-state-8.2.tar";
-          sha256 = "14v1nv797b4rxxxnvzwy6pp10g3mmvifb919iv7nx96sbn919w0p";
-        };
-        packageRequires = [ bind-map evil smartparens ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-lisp-state.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-matchit = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-matchit";
-        ename = "evil-matchit";
-        version = "3.0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar";
-          sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-nerd-commenter = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-nerd-commenter";
-        ename = "evil-nerd-commenter";
-        version = "3.6.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar";
-          sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-nerd-commenter.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-numbers = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-numbers";
-        ename = "evil-numbers";
-        version = "0.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar";
-          sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i";
-        };
-        packageRequires = [ emacs evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-numbers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-surround = callPackage ({ elpaBuild, evil, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-surround";
-        ename = "evil-surround";
-        version = "1.0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar";
-          sha256 = "1fzhqg2zrfl1yvhf96s5m0b9793cysciqbxiihxzrnnf2rnrlls2";
-        };
-        packageRequires = [ evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-surround.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-visual-mark-mode = callPackage ({ dash
-                                         , elpaBuild
-                                         , evil
-                                         , fetchurl
-                                         , lib }:
-      elpaBuild {
-        pname = "evil-visual-mark-mode";
-        ename = "evil-visual-mark-mode";
-        version = "0.0.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar";
-          sha256 = "0hjg9jmyhhc6a6zzjicwy62m9bh7wlw6hc4cf2g6g416c0ri2d18";
-        };
-        packageRequires = [ dash evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    evil-visualstar = callPackage ({ elpaBuild, evil, fetchurl, lib }:
-      elpaBuild {
-        pname = "evil-visualstar";
-        ename = "evil-visualstar";
-        version = "0.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/evil-visualstar-0.2.0.tar";
-          sha256 = "03liavxxpawvlgwdsihzz3z08yv227zjjqyll1cbmbk0678kbl7m";
-        };
-        packageRequires = [ evil ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/evil-visualstar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    exec-path-from-shell = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "exec-path-from-shell";
-        ename = "exec-path-from-shell";
-        version = "2.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar";
-          sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/exec-path-from-shell.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flx = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "flx";
-        ename = "flx";
-        version = "0.6.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar";
-          sha256 = "00d3q238grxcvnx6pshb7ajbz559gfp00pqaq56r2n5xqrvrxfnc";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flx.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flx-ido = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, flx, lib }:
-      elpaBuild {
-        pname = "flx-ido";
-        ename = "flx-ido";
-        version = "0.6.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar";
-          sha256 = "1933d3dcwynzs5qnv3pl4xdybj5gg0sa8zb58j0ld9hyiacm6zn5";
-        };
-        packageRequires = [ cl-lib flx ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flx-ido.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flycheck = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "flycheck";
-        ename = "flycheck";
-        version = "34.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar";
-          sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flycheck.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-guile = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , flymake ? null
-                                 , lib }:
-      elpaBuild {
-        pname = "flymake-guile";
-        ename = "flymake-guile";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar";
-          sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k";
-        };
-        packageRequires = [ emacs flymake ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-guile.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "flymake-kondor";
-        ename = "flymake-kondor";
-        version = "0.1.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar";
-          sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-kondor.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    flymake-popon = callPackage ({ elpaBuild
-                                 , emacs
-                                 , fetchurl
-                                 , flymake ? null
-                                 , lib
-                                 , popon
-                                 , posframe }:
-      elpaBuild {
-        pname = "flymake-popon";
-        ename = "flymake-popon";
-        version = "0.5.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar";
-          sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s";
-        };
-        packageRequires = [ emacs flymake popon posframe ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/flymake-popon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    focus = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "focus";
-        ename = "focus";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar";
-          sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/focus.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    forth-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "forth-mode";
-        ename = "forth-mode";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar";
-          sha256 = "04xcvjzvl4pgx48l2pzil7s2iqqbf86z57wv76ahp4sd1xigpfqc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/forth-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    free-keys = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "free-keys";
-        ename = "free-keys";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar";
-          sha256 = "04x4hmia5rx6bd8pkp5b9g4mn081r14vyk1jbdygdzr5w5rhifx3";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/free-keys.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gc-buffers = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gc-buffers";
-        ename = "gc-buffers";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar";
-          sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gc-buffers.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
-      elpaBuild {
-        pname = "geiser";
-        ename = "geiser";
-        version = "0.31";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
-          sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
-        };
-        packageRequires = [ emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-chez = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-chez";
-        ename = "geiser-chez";
-        version = "0.18";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar";
-          sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-chez.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-chibi = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-chibi";
-        ename = "geiser-chibi";
-        version = "0.17";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar";
-          sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-chibi.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-chicken = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-chicken";
-        ename = "geiser-chicken";
-        version = "0.17";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar";
-          sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-chicken.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-gambit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-gambit";
-        ename = "geiser-gambit";
-        version = "0.18.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar";
-          sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-gambit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-gauche = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-gauche";
-        ename = "geiser-gauche";
-        version = "0.0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar";
-          sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-gauche.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-guile = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , geiser
-                                , lib
-                                , transient }:
-      elpaBuild {
-        pname = "geiser-guile";
-        ename = "geiser-guile";
-        version = "0.28.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar";
-          sha256 = "148bvwcppv0qk7yh38c0m36hldw58cqhbyniyzwffagmlg0yqzsb";
-        };
-        packageRequires = [ emacs geiser transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-kawa = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-kawa";
-        ename = "geiser-kawa";
-        version = "0.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar";
-          sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-kawa.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-mit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-mit";
-        ename = "geiser-mit";
-        version = "0.15";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar";
-          sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-mit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-racket = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-racket";
-        ename = "geiser-racket";
-        version = "0.16";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar";
-          sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-racket.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    geiser-stklos = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
-      elpaBuild {
-        pname = "geiser-stklos";
-        ename = "geiser-stklos";
-        version = "1.8";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar";
-          sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s";
-        };
-        packageRequires = [ emacs geiser ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/geiser-stklos.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    git-commit = callPackage ({ dash
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib
-                              , transient
-                              , with-editor }:
-      elpaBuild {
-        pname = "git-commit";
-        ename = "git-commit";
-        version = "3.3.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar";
-          sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx";
-        };
-        packageRequires = [ dash emacs transient with-editor ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/git-commit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    git-modes = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "git-modes";
-        ename = "git-modes";
-        version = "1.4.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar";
-          sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/git-modes.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnu-apl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnu-apl-mode";
-        ename = "gnu-apl-mode";
-        version = "1.5.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar";
-          sha256 = "0hzdmrhrcnq49cklpmbx1sq7d9qd2q6pprgshhhjx45mnn1q24v0";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnu-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnu-indent";
-        ename = "gnu-indent";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar";
-          sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnu-indent.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gnuplot";
-        ename = "gnuplot";
-        version = "0.8.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar";
-          sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gnuplot.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    go-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "go-mode";
-        ename = "go-mode";
-        version = "1.6.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar";
-          sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/go-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    golden-ratio = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "golden-ratio";
-        ename = "golden-ratio";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/golden-ratio-1.0.1.tar";
-          sha256 = "169jl82906k03vifks0zs4sk5gcxax5jii6nysh6y6ns2h656cqx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/golden-ratio.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gotham-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "gotham-theme";
-        ename = "gotham-theme";
-        version = "1.1.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar";
-          sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gotham-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    goto-chg = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "goto-chg";
-        ename = "goto-chg";
-        version = "1.7.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar";
-          sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/goto-chg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gptel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, transient }:
-      elpaBuild {
-        pname = "gptel";
-        ename = "gptel";
-        version = "0.9.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar";
-          sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4";
-        };
-        packageRequires = [ compat emacs transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gptel.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "graphql-mode";
-        ename = "graphql-mode";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar";
-          sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/graphql-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gruber-darker-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gruber-darker-theme";
-        ename = "gruber-darker-theme";
-        version = "0.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar";
-          sha256 = "1ib9ad120g39fbkj41am6khglv1p6g3a9hk2jj2kl0c6czr1il2r";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "gruvbox-theme";
-        ename = "gruvbox-theme";
-        version = "1.30.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar";
-          sha256 = "1y30aahdxzdfmj021vbrz4zmdq6lr9k08hna9i1a8g4cywgbz8ri";
-        };
-        packageRequires = [ autothemer ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/gruvbox-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    guru-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "guru-mode";
-        ename = "guru-mode";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar";
-          sha256 = "0kmbllzvp8qzj8ck2azq2wfw66ywc80zicncja62bi6zsh2l622z";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/guru-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    haml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "haml-mode";
-        ename = "haml-mode";
-        version = "3.2.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar";
-          sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/haml-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    haskell-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "haskell-mode";
-        ename = "haskell-mode";
-        version = "17.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar";
-          sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/haskell-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "haskell-tng-mode";
-        ename = "haskell-tng-mode";
-        version = "0.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar";
-          sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, wfnames }:
-      elpaBuild {
-        pname = "helm";
-        ename = "helm";
-        version = "3.9.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar";
-          sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0";
-        };
-        packageRequires = [ helm-core wfnames ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/helm.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    helm-core = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "helm-core";
-        ename = "helm-core";
-        version = "3.9.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
-          sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
-        };
-        packageRequires = [ async emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/helm-core.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hideshowvis = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hideshowvis";
-        ename = "hideshowvis";
-        version = "0.8";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar";
-          sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hideshowvis.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    highlight-parentheses = callPackage ({ elpaBuild
-                                         , emacs
-                                         , fetchurl
-                                         , lib }:
-      elpaBuild {
-        pname = "highlight-parentheses";
-        ename = "highlight-parentheses";
-        version = "2.2.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar";
-          sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hl-block-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hl-block-mode";
-        ename = "hl-block-mode";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar";
-          sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hl-block-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hl-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "hl-column";
-        ename = "hl-column";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar";
-          sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hl-column.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    htmlize = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "htmlize";
-        ename = "htmlize";
-        version = "1.56";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar";
-          sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/htmlize.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    hyperdrive = callPackage ({ compat
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib
-                              , map
-                              , persist
-                              , plz
-                              , taxy-magit-section
-                              , transient }:
-      elpaBuild {
-        pname = "hyperdrive";
-        ename = "hyperdrive";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar";
-          sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw";
-        };
-        packageRequires = [
-          compat
-          emacs
-          map
-          persist
-          plz
-          taxy-magit-section
-          transient
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/hyperdrive.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    idle-highlight-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "idle-highlight-mode";
-        ename = "idle-highlight-mode";
-        version = "1.1.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar";
-          sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/idle-highlight-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    idris-mode = callPackage ({ cl-lib ? null
-                              , elpaBuild
-                              , emacs
-                              , fetchurl
-                              , lib
-                              , prop-menu }:
-      elpaBuild {
-        pname = "idris-mode";
-        ename = "idris-mode";
-        version = "1.1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/idris-mode-1.1.0.tar";
-          sha256 = "1vlm7gshrkwp9lfm5jcp1rnsjxwzqknrjhl3q5ifwmicyvqkqwsv";
-        };
-        packageRequires = [ cl-lib emacs prop-menu ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/idris-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    iedit = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "iedit";
-        ename = "iedit";
-        version = "0.9.9.9.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar";
-          sha256 = "12s71yj8ycrls2fl97qs3igk5y06ksbmfq2idz0a2zrdggndg0b6";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/iedit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    inf-clojure = callPackage ({ clojure-mode
-                               , elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "inf-clojure";
-        ename = "inf-clojure";
-        version = "3.2.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
-          sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb";
-        };
-        packageRequires = [ clojure-mode emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/inf-clojure.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    inf-ruby = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "inf-ruby";
-        ename = "inf-ruby";
-        version = "2.8.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar";
-          sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/inf-ruby.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    inkpot-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "inkpot-theme";
-        ename = "inkpot-theme";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar";
-          sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/inkpot-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    iwindow = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "iwindow";
-        ename = "iwindow";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar";
-          sha256 = "04d5dxqazxfx8ap9vmhj643x7lmpa0wmzcm9w9mlvsk2kaz0j19i";
-        };
-        packageRequires = [ compat emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/iwindow.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    j-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "j-mode";
-        ename = "j-mode";
-        version = "2.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar";
-          sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/j-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jade-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "jade-mode";
-        ename = "jade-mode";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar";
-          sha256 = "0pv0n9vharda92avggd91q8i98yjim9ccnz5m5c5xw12hxcsfj17";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jade-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    jinja2-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "jinja2-mode";
-        ename = "jinja2-mode";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/jinja2-mode-0.3.tar";
-          sha256 = "0dg1zn7mghclnxsmcl5nq5jqibm18sja23058q9lk6nph4fvz5dq";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/jinja2-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    julia-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "julia-mode";
-        ename = "julia-mode";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar";
-          sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/julia-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    keycast = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "keycast";
-        ename = "keycast";
-        version = "1.4.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar";
-          sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/keycast.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    kotlin-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "kotlin-mode";
-        ename = "kotlin-mode";
-        version = "2.0.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar";
-          sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/kotlin-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lorem-ipsum = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "lorem-ipsum";
-        ename = "lorem-ipsum";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar";
-          sha256 = "0d1c6zalnqhyn88dbbi8wqzvp0ppswhqv656hbj129jwp4iida4x";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "lua-mode";
-        ename = "lua-mode";
-        version = "20221027";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar";
-          sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/lua-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    macrostep = callPackage ({ cl-lib ? null
-                             , compat
-                             , elpaBuild
-                             , fetchurl
-                             , lib }:
-      elpaBuild {
-        pname = "macrostep";
-        ename = "macrostep";
-        version = "0.9.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar";
-          sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk";
-        };
-        packageRequires = [ cl-lib compat ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/macrostep.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    magit = callPackage ({ dash
-                         , elpaBuild
-                         , emacs
-                         , fetchurl
-                         , git-commit
-                         , lib
-                         , magit-section
-                         , transient
-                         , with-editor }:
-      elpaBuild {
-        pname = "magit";
-        ename = "magit";
-        version = "3.3.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar";
-          sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z";
-        };
-        packageRequires = [
-          dash
-          emacs
-          git-commit
-          magit-section
-          transient
-          with-editor
-        ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/magit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    magit-section = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "magit-section";
-        ename = "magit-section";
-        version = "3.3.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar";
-          sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/magit-section.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "markdown-mode";
-        ename = "markdown-mode";
-        version = "2.6";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar";
-          sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mastodon = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , persist
-                            , request }:
-      elpaBuild {
-        pname = "mastodon";
-        ename = "mastodon";
-        version = "1.0.24";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar";
-          sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023";
-        };
-        packageRequires = [ emacs persist request ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mastodon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    material-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "material-theme";
-        ename = "material-theme";
-        version = "2015";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar";
-          sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/material-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mentor = callPackage ({ async
-                          , elpaBuild
-                          , emacs
-                          , fetchurl
-                          , lib
-                          , seq
-                          , url-scgi
-                          , xml-rpc }:
-      elpaBuild {
-        pname = "mentor";
-        ename = "mentor";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar";
-          sha256 = "1sqdwdbanrdvrr8qqn23ylcyc98jcjc7yq1g1d963v8d9wfbailv";
-        };
-        packageRequires = [ async emacs seq url-scgi xml-rpc ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mentor.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    meow = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "meow";
-        ename = "meow";
-        version = "1.4.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar";
-          sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/meow.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    minibar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "minibar";
-        ename = "minibar";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar";
-          sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/minibar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    moe-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "moe-theme";
-        ename = "moe-theme";
-        version = "1.0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar";
-          sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/moe-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    monokai-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "monokai-theme";
-        ename = "monokai-theme";
-        version = "3.5.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/monokai-theme-3.5.3.tar";
-          sha256 = "14ylizbhfj2hlc52gi2fs70avz39s46wnr96dbbq4l8vmhxs7il5";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/monokai-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    mpv = callPackage ({ cl-lib ? null
-                       , elpaBuild
-                       , emacs
-                       , fetchurl
-                       , json ? null
-                       , lib
-                       , org }:
-      elpaBuild {
-        pname = "mpv";
-        ename = "mpv";
-        version = "0.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/mpv-0.2.0.tar";
-          sha256 = "183alhd5fvmlhhfm0wl7b50axs01pgiwv735c43bfzdi2ny4szcm";
-        };
-        packageRequires = [ cl-lib emacs json org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/mpv.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "multiple-cursors";
-        ename = "multiple-cursors";
-        version = "1.4.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar";
-          sha256 = "0452wrbwg8hyvsri99h71g04dll5w65na265pp9whphq6l06ikrx";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/multiple-cursors.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nasm-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "nasm-mode";
-        ename = "nasm-mode";
-        version = "1.1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar";
-          sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nasm-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nginx-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "nginx-mode";
-        ename = "nginx-mode";
-        version = "1.1.10";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.10.tar";
-          sha256 = "0c6biqxbwpkrbqi639ifgv8jkfadssyznjkq6hxvqgjh3nnyrlx3";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nginx-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    nix-mode = callPackage ({ elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , magit-section
-                            , transient }:
-      elpaBuild {
-        pname = "nix-mode";
-        ename = "nix-mode";
-        version = "1.5.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar";
-          sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g";
-        };
-        packageRequires = [ emacs magit-section transient ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/nix-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    oblivion-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "oblivion-theme";
-        ename = "oblivion-theme";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar";
-          sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/oblivion-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    opam-switch-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "opam-switch-mode";
-        ename = "opam-switch-mode";
-        version = "1.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar";
-          sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org-auto-tangle";
-        ename = "org-auto-tangle";
-        version = "0.6.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar";
-          sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd";
-        };
-        packageRequires = [ async emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-contrib";
-        ename = "org-contrib";
-        version = "0.4.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar";
-          sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-contrib.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-drill = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , lib
-                             , org
-                             , persist
-                             , seq }:
-      elpaBuild {
-        pname = "org-drill";
-        ename = "org-drill";
-        version = "2.7.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-drill-2.7.0.tar";
-          sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg";
-        };
-        packageRequires = [ emacs org persist seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-drill.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-journal = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-journal";
-        ename = "org-journal";
-        version = "2.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar";
-          sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-journal.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org-mime";
-        ename = "org-mime";
-        version = "0.3.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar";
-          sha256 = "1r24inqadhlsqc896vlm10bhr76aj6hnm6q5snhzpz4kk9j0gybd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-mime.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-present = callPackage ({ elpaBuild, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-present";
-        ename = "org-present";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-present-0.1.tar";
-          sha256 = "18zrvrd9aih57gj14qmxv9rf5j859vkvxcni3fkdbj84y5pq2fpy";
-        };
-        packageRequires = [ org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-present.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-superstar = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
-      elpaBuild {
-        pname = "org-superstar";
-        ename = "org-superstar";
-        version = "1.5.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar";
-          sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g";
-        };
-        packageRequires = [ emacs org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-superstar.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-transclusion-http = callPackage ({ elpaBuild
-                                         , emacs
-                                         , fetchurl
-                                         , lib
-                                         , org-transclusion
-                                         , plz }:
-      elpaBuild {
-        pname = "org-transclusion-http";
-        ename = "org-transclusion-http";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-transclusion-http-0.4.tar";
-          sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr";
-        };
-        packageRequires = [ emacs org-transclusion plz ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-transclusion-http.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    org-tree-slide = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "org-tree-slide";
-        ename = "org-tree-slide";
-        version = "2.8.22";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar";
-          sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/org-tree-slide.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    orgit = callPackage ({ compat
-                         , elpaBuild
-                         , emacs
-                         , fetchurl
-                         , lib
-                         , magit
-                         , org }:
-      elpaBuild {
-        pname = "orgit";
-        ename = "orgit";
-        version = "1.9.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/orgit-1.9.0.tar";
-          sha256 = "0g0nr284lgmd6jmk0w412gcildl6fzxv9kskgzr7ksk09qk9qfll";
-        };
-        packageRequires = [ compat emacs magit org ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/orgit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    p4-16-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "p4-16-mode";
-        ename = "p4-16-mode";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/p4-16-mode-0.3.tar";
-          sha256 = "1kwfqs7ikfjkkpv3m440ak40mjyf493gqygmc4hac8phlf9ns6dv";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/p4-16-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    package-lint = callPackage ({ elpaBuild, emacs, fetchurl, let-alist, lib }:
-      elpaBuild {
-        pname = "package-lint";
-        ename = "package-lint";
-        version = "0.23";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar";
-          sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg";
-        };
-        packageRequires = [ emacs let-alist ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/package-lint.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pacmacs = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pacmacs";
-        ename = "pacmacs";
-        version = "0.1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar";
-          sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9";
-        };
-        packageRequires = [ dash emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pacmacs.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    page-break-lines = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "page-break-lines";
-        ename = "page-break-lines";
-        version = "0.15";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar";
-          sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/page-break-lines.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    paredit = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "paredit";
-        ename = "paredit";
-        version = "26";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/paredit-26.tar";
-          sha256 = "1sk8nhsysa3y8fvds67cbwwzivzxlyw8d81y7f7pqc5lflidjrpc";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/paredit.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    parseclj = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "parseclj";
-        ename = "parseclj";
-        version = "1.1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar";
-          sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/parseclj.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    parseedn = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, parseclj }:
-      elpaBuild {
-        pname = "parseedn";
-        ename = "parseedn";
-        version = "1.2.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.1.tar";
-          sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak";
-        };
-        packageRequires = [ emacs map parseclj ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/parseedn.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pcmpl-args = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pcmpl-args";
-        ename = "pcmpl-args";
-        version = "0.1.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar";
-          sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pcmpl-args.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pcre2el = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "pcre2el";
-        ename = "pcre2el";
-        version = "1.12";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar";
-          sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pcre2el.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    pdf-tools = callPackage ({ elpaBuild
-                             , emacs
-                             , fetchurl
-                             , let-alist
-                             , lib
-                             , tablist }:
-      elpaBuild {
-        pname = "pdf-tools";
-        ename = "pdf-tools";
-        version = "1.1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.1.0.tar";
-          sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc";
-        };
-        packageRequires = [ emacs let-alist tablist ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/pdf-tools.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    php-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "php-mode";
-        ename = "php-mode";
-        version = "1.25.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar";
-          sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/php-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    popon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "popon";
-        ename = "popon";
-        version = "0.13";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar";
-          sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/popon.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "popup";
-        ename = "popup";
-        version = "0.5.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar";
-          sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/popup.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "projectile";
-        ename = "projectile";
-        version = "2.8.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar";
-          sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/projectile.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    proof-general = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "proof-general";
-        ename = "proof-general";
-        version = "4.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar";
-          sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/proof-general.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    prop-menu = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "prop-menu";
-        ename = "prop-menu";
-        version = "0.1.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar";
-          sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw";
-        };
-        packageRequires = [ cl-lib emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/prop-menu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    racket-mode = callPackage ({ elpaBuild
-                               , emacs
-                               , fetchurl
-                               , lib }:
-      elpaBuild {
-        pname = "racket-mode";
-        ename = "racket-mode";
-        version = "1.0.20240621.124732";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar";
-          sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/racket-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rainbow-delimiters = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "rainbow-delimiters";
-        ename = "rainbow-delimiters";
-        version = "2.1.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/rainbow-delimiters-2.1.5.tar";
-          sha256 = "0f4zhz92z5qk3p9ips2d76qi64xv6y8jrxh5nvbq46ivj5c0hnw2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rainbow-delimiters.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    raku-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "raku-mode";
-        ename = "raku-mode";
-        version = "0.2.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar";
-          sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/raku-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    recomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "recomplete";
-        ename = "recomplete";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar";
-          sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/recomplete.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    reformatter = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "reformatter";
-        ename = "reformatter";
-        version = "0.8";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar";
-          sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/reformatter.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "request";
-        ename = "request";
-        version = "0.3.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
-          sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/request.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rfc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "rfc-mode";
-        ename = "rfc-mode";
-        version = "1.4.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar";
-          sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rfc-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "rubocop";
-        ename = "rubocop";
-        version = "0.6.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar";
-          sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rubocop.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    rust-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "rust-mode";
-        ename = "rust-mode";
-        version = "1.0.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar";
-          sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/rust-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sass-mode = callPackage ({ elpaBuild, fetchurl, haml-mode, lib }:
-      elpaBuild {
-        pname = "sass-mode";
-        ename = "sass-mode";
-        version = "3.0.16";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar";
-          sha256 = "0ag7qi9dq4j23ywbwni7pblp6l1ik95vjhclxm82s1911a8m7pj2";
-        };
-        packageRequires = [ haml-mode ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sass-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scad-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "scad-mode";
-        ename = "scad-mode";
-        version = "94.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar";
-          sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scad-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scala-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "scala-mode";
-        ename = "scala-mode";
-        version = "0.23";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar";
-          sha256 = "1zwd9cajw90v25rwdlylhdrc1xwvnf74c2rckz3cs096xsxc1qx2";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scala-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scroll-on-drag = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "scroll-on-drag";
-        ename = "scroll-on-drag";
-        version = "0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar";
-          sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scroll-on-drag.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    scroll-on-jump = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "scroll-on-jump";
-        ename = "scroll-on-jump";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar";
-          sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/scroll-on-jump.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sesman = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sesman";
-        ename = "sesman";
-        version = "0.3.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar";
-          sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sesman.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    shellcop = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "shellcop";
-        ename = "shellcop";
-        version = "0.1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar";
-          sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/shellcop.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    slime = callPackage ({ elpaBuild, emacs, fetchurl, lib, macrostep }:
-      elpaBuild {
-        pname = "slime";
-        ename = "slime";
-        version = "2.30";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar";
-          sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f";
-        };
-        packageRequires = [ emacs macrostep ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/slime.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sly";
-        ename = "sly";
-        version = "1.0.43";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
-          sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sly.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    smartparens = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "smartparens";
-        ename = "smartparens";
-        version = "1.11.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar";
-          sha256 = "0kvlyx2bhw4q6k79wf5cm4srlmfncsbii4spdgafwmv8j7vw6ya3";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/smartparens.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    solarized-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "solarized-theme";
-        ename = "solarized-theme";
-        version = "2.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar";
-          sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/solarized-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    spacemacs-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "spacemacs-theme";
-        ename = "spacemacs-theme";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/spacemacs-theme-0.2.tar";
-          sha256 = "07lkaj6gm5iz503p5l6sm1y62mc5wk13nrwzv81f899jw99jcgml";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/spacemacs-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    spell-fu = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "spell-fu";
-        ename = "spell-fu";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar";
-          sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/spell-fu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sqlite3 = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sqlite3";
-        ename = "sqlite3";
-        version = "0.17";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar";
-          sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sqlite3.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "stylus-mode";
-        ename = "stylus-mode";
-        version = "1.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar";
-          sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/stylus-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "subatomic-theme";
-        ename = "subatomic-theme";
-        version = "1.8.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar";
-          sha256 = "0vpaswm5mdyb8cir160mb8ffgzaz7kbq3gvc2zrnh531zb994mqg";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/subatomic-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    subed = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "subed";
-        ename = "subed";
-        version = "1.2.14";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
-          sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/subed.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    sweeprolog = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "sweeprolog";
-        ename = "sweeprolog";
-        version = "0.27.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar";
-          sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/sweeprolog.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
-      elpaBuild {
-        pname = "swift-mode";
-        ename = "swift-mode";
-        version = "9.1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar";
-          sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv";
-        };
-        packageRequires = [ emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/swift-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    swsw = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "swsw";
-        ename = "swsw";
-        version = "2.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/swsw-2.3.tar";
-          sha256 = "0qwdv174bh9k1bpd5szzmhk7hw89xf7rz2i2hzdrmlpvcs3ps653";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/swsw.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    symbol-overlay = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "symbol-overlay";
-        ename = "symbol-overlay";
-        version = "4.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar";
-          sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/symbol-overlay.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "systemd";
-        ename = "systemd";
-        version = "1.6.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar";
-          sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/systemd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tablist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tablist";
-        ename = "tablist";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar";
-          sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tablist.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tangotango-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "tangotango-theme";
-        ename = "tangotango-theme";
-        version = "0.0.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/tangotango-theme-0.0.7.tar";
-          sha256 = "1w287p8lpmkm80qy1di2xmd71k051qmg89cn7s21kgi4br3hbbph";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tangotango-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    telephone-line = callPackage ({ cl-generic
-                                  , cl-lib ? null
-                                  , elpaBuild
-                                  , emacs
-                                  , fetchurl
-                                  , lib
-                                  , seq }:
-      elpaBuild {
-        pname = "telephone-line";
-        ename = "telephone-line";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/telephone-line-0.5.tar";
-          sha256 = "0pmn1r2g639c8g3rw5q2d5cgdz79d4ipr3r4dzwx2mgff3ri1ylm";
-        };
-        packageRequires = [ cl-generic cl-lib emacs seq ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/telephone-line.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    testcover-mark-line = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "testcover-mark-line";
-        ename = "testcover-mark-line";
-        version = "0.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar";
-          sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    textile-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "textile-mode";
-        ename = "textile-mode";
-        version = "1.0.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar";
-          sha256 = "02nc3wijsb626631m09f2ygpmimkbl46x5hi8yk0wl18y66yq972";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/textile-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    toc-org = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "toc-org";
-        ename = "toc-org";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/toc-org-1.1.tar";
-          sha256 = "0qhkn1a4j1q5gflqlyha2534sms8xsx03i7dizrckhl368yznwan";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/toc-org.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    totp-auth = callPackage ({ base32, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "totp-auth";
-        ename = "totp-auth";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar";
-          sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5";
-        };
-        packageRequires = [ base32 emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/totp-auth.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    treeview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "treeview";
-        ename = "treeview";
-        version = "1.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar";
-          sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/treeview.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "tuareg";
-        ename = "tuareg";
-        version = "3.0.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar";
-          sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj";
-        };
-        packageRequires = [ caml emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/tuareg.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    typescript-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "typescript-mode";
-        ename = "typescript-mode";
-        version = "0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar";
-          sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/typescript-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ujelly-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ujelly-theme";
-        ename = "ujelly-theme";
-        version = "1.2.9";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar";
-          sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ujelly-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    undo-fu = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "undo-fu";
-        ename = "undo-fu";
-        version = "0.5";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar";
-          sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/undo-fu.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    undo-fu-session = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "undo-fu-session";
-        ename = "undo-fu-session";
-        version = "0.7";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar";
-          sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/undo-fu-session.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "vc-fossil";
-        ename = "vc-fossil";
-        version = "20230504";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/vc-fossil-20230504.tar";
-          sha256 = "1q78xcfzpvvrlr9b9yh57asrlks2n0nhxhxl8dyfwad6gm0yr948";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vc-fossil.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    vcomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "vcomplete";
-        ename = "vcomplete";
-        version = "2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar";
-          sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/vcomplete.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    visual-fill-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "visual-fill-column";
-        ename = "visual-fill-column";
-        version = "2.6.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar";
-          sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/visual-fill-column.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "web-mode";
-        ename = "web-mode";
-        version = "17.3.19";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar";
-          sha256 = "0gmi0p118kd2xvlbp6y5mz2f0sgdm8qwna76lrmbnsxw4c9g5c6p";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/web-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    webpaste = callPackage ({ cl-lib ? null
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , request }:
-      elpaBuild {
-        pname = "webpaste";
-        ename = "webpaste";
-        version = "3.2.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/webpaste-3.2.2.tar";
-          sha256 = "04156iwgbc49l3b6s5vzbffw1xrkansvczi6q29d5waxwi6a2nfc";
-        };
-        packageRequires = [ cl-lib emacs request ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/webpaste.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wfnames = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "wfnames";
-        ename = "wfnames";
-        version = "1.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar";
-          sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wfnames.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    wgrep = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "wgrep";
-        ename = "wgrep";
-        version = "3.0.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar";
-          sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/wgrep.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    why-this = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "why-this";
-        ename = "why-this";
-        version = "2.0.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar";
-          sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/why-this.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    with-editor = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "with-editor";
-        ename = "with-editor";
-        version = "3.3.4";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar";
-          sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc";
-        };
-        packageRequires = [ compat emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/with-editor.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    with-simulated-input = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "with-simulated-input";
-        ename = "with-simulated-input";
-        version = "3.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar";
-          sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/with-simulated-input.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    workroom = callPackage ({ compat
-                            , elpaBuild
-                            , emacs
-                            , fetchurl
-                            , lib
-                            , project }:
-      elpaBuild {
-        pname = "workroom";
-        ename = "workroom";
-        version = "2.3.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar";
-          sha256 = "0k0npmcs3cdkfds0r8p0gm8xa42bzdjiciilh65jka15fqknx486";
-        };
-        packageRequires = [ compat emacs project ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/workroom.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    writegood-mode = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "writegood-mode";
-        ename = "writegood-mode";
-        version = "2.2.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar";
-          sha256 = "00phrzbd03gzc5y2ybizyp9smd6ybmmx2j7jf6hg5cmfyjmq8ahw";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/writegood-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ws-butler = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "ws-butler";
-        ename = "ws-butler";
-        version = "0.6";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar";
-          sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/ws-butler.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xah-fly-keys = callPackage ({ elpaBuild
-                                , emacs
-                                , fetchurl
-                                , lib }:
-      elpaBuild {
-        pname = "xah-fly-keys";
-        ename = "xah-fly-keys";
-        version = "25.9.20240703220947";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar";
-          sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xkcd = callPackage ({ elpaBuild, fetchurl, json ? null, lib }:
-      elpaBuild {
-        pname = "xkcd";
-        ename = "xkcd";
-        version = "1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar";
-          sha256 = "1qs4jv6h2i8g7s214xr4s6jgykdbac4lfc5hd0gmylkwlvs3pzcp";
-        };
-        packageRequires = [ json ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xkcd.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    xml-rpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xml-rpc";
-        ename = "xml-rpc";
-        version = "1.6.17";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar";
-          sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/xml-rpc.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    yaml-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "yaml-mode";
-        ename = "yaml-mode";
-        version = "0.0.16";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar";
-          sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/yaml-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    yasnippet-snippets = callPackage ({ elpaBuild, fetchurl, lib, yasnippet }:
-      elpaBuild {
-        pname = "yasnippet-snippets";
-        ename = "yasnippet-snippets";
-        version = "1.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar";
-          sha256 = "0si61d0niabh18vbgdz6w5zirpxpp7c4mrcn5x1n3r5vnhv3n7m2";
-        };
-        packageRequires = [ yasnippet ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }:
-      elpaBuild {
-        pname = "zenburn-theme";
-        ename = "zenburn-theme";
-        version = "2.8.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.8.0.tar";
-          sha256 = "0z733svsjsads655jgmc0b33icmygwaahxa27qi32s1pq84zqb4z";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/zenburn-theme.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, reformatter }:
-      elpaBuild {
-        pname = "zig-mode";
-        ename = "zig-mode";
-        version = "0.0.8";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar";
-          sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87";
-        };
-        packageRequires = [ emacs reformatter ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/zig-mode.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-  }
+{
+  adoc-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "adoc-mode";
+      ename = "adoc-mode";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar";
+        sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/adoc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  afternoon-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "afternoon-theme";
+      ename = "afternoon-theme";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar";
+        sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/afternoon-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  alect-themes = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "alect-themes";
+      ename = "alect-themes";
+      version = "0.10";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar";
+        sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/alect-themes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ample-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ample-theme";
+      ename = "ample-theme";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/ample-theme-0.3.0.tar";
+        sha256 = "12z8z6da1xfc642w2wc82sjlfj3ymlz3jwrg3ydc2fapis2d3ibi";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ample-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  annotate = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "annotate";
+      ename = "annotate";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar";
+        sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/annotate.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  anti-zenburn-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "anti-zenburn-theme";
+      ename = "anti-zenburn-theme";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme-2.5.1.tar";
+        sha256 = "121038d6mjdfis1c5v9277bd6kz656n0c25daxq85mfswvjlar0i";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/anti-zenburn-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  anzu = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "anzu";
+      ename = "anzu";
+      version = "0.64";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar";
+        sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/anzu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  apache-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "apache-mode";
+      ename = "apache-mode";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar";
+        sha256 = "10fgbgww7j60dik7b7mvnm1zwgv9y8p5wzggkrdk50dv3gjfxg8f";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/apache-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  apropospriate-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "apropospriate-theme";
+      ename = "apropospriate-theme";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.2.0.tar";
+        sha256 = "1hsv26iqr0g6c3gy1df2qkd3ilwq6xaa89ch7pqh64737qrlw9db";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/apropospriate-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  arduino-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      spinner,
+    }:
+    elpaBuild {
+      pname = "arduino-mode";
+      ename = "arduino-mode";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar";
+        sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y";
+      };
+      packageRequires = [
+        emacs
+        spinner
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/arduino-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  auto-dim-other-buffers = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "auto-dim-other-buffers";
+      ename = "auto-dim-other-buffers";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar";
+        sha256 = "0rgf0q66kdw9ind5bi01ydk84rclcd3kmlfzm9rfb429xnhqfzw8";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  autothemer = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "autothemer";
+      ename = "autothemer";
+      version = "0.2.18";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar";
+        sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/autothemer.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  base32 = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "base32";
+      ename = "base32";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar";
+        sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/base32.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bash-completion = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bash-completion";
+      ename = "bash-completion";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar";
+        sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bash-completion.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  beancount = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "beancount";
+      ename = "beancount";
+      version = "0.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/beancount-0.9.tar";
+        sha256 = "1s0w17mq8kilkrd33pan78px6mz5z96d7gvdmy2shg3hvj1jbq09";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/beancount.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  better-jumper = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "better-jumper";
+      ename = "better-jumper";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar";
+        sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/better-jumper.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bind-map = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bind-map";
+      ename = "bind-map";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar";
+        sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bind-map.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  bison-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "bison-mode";
+      ename = "bison-mode";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar";
+        sha256 = "0k0h96bpcndi3m9fdk74j0ynm50n6by508mv3ds9ala26dpdr7qa";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/bison-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  blow = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "blow";
+      ename = "blow";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar";
+        sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/blow.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  blueprint-ts-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "blueprint-ts-mode";
+      ename = "blueprint-ts-mode";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar";
+        sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  boxquote = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "boxquote";
+      ename = "boxquote";
+      version = "2.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar";
+        sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/boxquote.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  buttercup = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "buttercup";
+      ename = "buttercup";
+      version = "1.35";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar";
+        sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/buttercup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  camera = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "camera";
+      ename = "camera";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar";
+        sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/camera.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  caml = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "caml";
+      ename = "caml";
+      version = "4.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar";
+        sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/caml.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cdlatex = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cdlatex";
+      ename = "cdlatex";
+      version = "4.18.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar";
+        sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cdlatex.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cider = callPackage (
+    {
+      clojure-mode,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      parseedn,
+      queue,
+      seq,
+      sesman,
+      spinner,
+      transient,
+    }:
+    elpaBuild {
+      pname = "cider";
+      ename = "cider";
+      version = "1.15.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar";
+        sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6";
+      };
+      packageRequires = [
+        clojure-mode
+        emacs
+        parseedn
+        queue
+        seq
+        sesman
+        spinner
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cider.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  clojure-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "clojure-mode";
+      ename = "clojure-mode";
+      version = "5.19.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
+        sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/clojure-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  clojure-ts-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "clojure-ts-mode";
+      ename = "clojure-ts-mode";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar";
+        sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/clojure-ts-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  coffee-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "coffee-mode";
+      ename = "coffee-mode";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar";
+        sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  color-theme-tangotango = callPackage (
+    {
+      color-theme,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "color-theme-tangotango";
+      ename = "color-theme-tangotango";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/color-theme-tangotango-0.0.6.tar";
+        sha256 = "0lfr3xg9xvfjb12kcw80d35a1ayn4f5w1dkd2b0kx0wxkq0bykim";
+      };
+      packageRequires = [ color-theme ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/color-theme-tangotango.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  consult-flycheck = callPackage (
+    {
+      consult,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      flycheck,
+      lib,
+    }:
+    elpaBuild {
+      pname = "consult-flycheck";
+      ename = "consult-flycheck";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.0.tar";
+        sha256 = "17kc7v50zq69l4803nh8sjnqwi59p09wjzqkwka6g4dapya3h2xy";
+      };
+      packageRequires = [
+        consult
+        emacs
+        flycheck
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/consult-flycheck.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  corfu-terminal = callPackage (
+    {
+      corfu,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      popon,
+    }:
+    elpaBuild {
+      pname = "corfu-terminal";
+      ename = "corfu-terminal";
+      version = "0.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.7.tar";
+        sha256 = "0a41hfma4iiinq2cgvwqqwxhrwjn5c7igl5sgvgx0mbjki2n6sll";
+      };
+      packageRequires = [
+        corfu
+        emacs
+        popon
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/corfu-terminal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  crux = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "crux";
+      ename = "crux";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar";
+        sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/crux.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  csv2ledger = callPackage (
+    {
+      csv-mode,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "csv2ledger";
+      ename = "csv2ledger";
+      version = "1.5.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar";
+        sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls";
+      };
+      packageRequires = [
+        csv-mode
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/csv2ledger.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cyberpunk-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "cyberpunk-theme";
+      ename = "cyberpunk-theme";
+      version = "1.22";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/cyberpunk-theme-1.22.tar";
+        sha256 = "1kgkgpb07d4kh2rf88pfgyji42qv80443i67nzha2fx01zbd5swb";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cyberpunk-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  cycle-at-point = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      recomplete,
+    }:
+    elpaBuild {
+      pname = "cycle-at-point";
+      ename = "cycle-at-point";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar";
+        sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z";
+      };
+      packageRequires = [
+        emacs
+        recomplete
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/cycle-at-point.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  d-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "d-mode";
+      ename = "d-mode";
+      version = "202003130913";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar";
+        sha256 = "0sdyk8q1pfk5gbj5hdyc1djmyb02vvhs4s2fbbxk52nlkx95p46s";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/d-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dart-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dart-mode";
+      ename = "dart-mode";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar";
+        sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dart-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  denote-refs = callPackage (
+    {
+      denote,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "denote-refs";
+      ename = "denote-refs";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar";
+        sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0";
+      };
+      packageRequires = [
+        denote
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/denote-refs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devhelp = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devhelp";
+      ename = "devhelp";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar";
+        sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/devhelp.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  devil = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "devil";
+      ename = "devil";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar";
+        sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/devil.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  diff-ansi = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "diff-ansi";
+      ename = "diff-ansi";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar";
+        sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/diff-ansi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  doc-show-inline = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "doc-show-inline";
+      ename = "doc-show-inline";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar";
+        sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/doc-show-inline.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dockerfile-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dockerfile-mode";
+      ename = "dockerfile-mode";
+      version = "1.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar";
+        sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dracula-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dracula-theme";
+      ename = "dracula-theme";
+      version = "1.8.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar";
+        sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dracula-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  drupal-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      php-mode,
+    }:
+    elpaBuild {
+      pname = "drupal-mode";
+      ename = "drupal-mode";
+      version = "0.7.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar";
+        sha256 = "1wr05pi5sm994cdzj329gr1lwxvq4w9wmc806izxq3fjifx0m609";
+      };
+      packageRequires = [ php-mode ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/drupal-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  dslide = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "dslide";
+      ename = "dslide";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
+        sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/dslide.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  eat = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "eat";
+      ename = "eat";
+      version = "0.9.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar";
+        sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/eat.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  edit-indirect = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "edit-indirect";
+      ename = "edit-indirect";
+      version = "0.1.13";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar";
+        sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/edit-indirect.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  editorconfig = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      nadvice,
+    }:
+    elpaBuild {
+      pname = "editorconfig";
+      ename = "editorconfig";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar";
+        sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv";
+      };
+      packageRequires = [
+        emacs
+        nadvice
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/editorconfig.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elixir-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "elixir-mode";
+      ename = "elixir-mode";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar";
+        sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/elixir-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  elpher = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "elpher";
+      ename = "elpher";
+      version = "3.6.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
+        sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/elpher.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  engine-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "engine-mode";
+      ename = "engine-mode";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar";
+        sha256 = "0gp1mnf0yaq4w91pj989dzlxpbpcqqj0yls23wf2ly53kbaarzv9";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/engine-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil";
+      ename = "evil";
+      version = "1.15.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar";
+        sha256 = "0ciglddlq0z91jyggp86d9g3gwfzjp55xhldqpxpq39a2xkwqh0q";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-anzu = callPackage (
+    {
+      anzu,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-anzu";
+      ename = "evil-anzu";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-anzu-0.2.tar";
+        sha256 = "1vn61aj0bnvkj2l3cd8m8q3n7kn09hdp6d13wc58w9pw8nrg0vq5";
+      };
+      packageRequires = [
+        anzu
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-anzu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-args = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-args";
+      ename = "evil-args";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar";
+        sha256 = "0fv30wny2f4mg8l9jrjgxisz6nbmn84980yszbrcbkqi81dzzlyi";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-args.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-escape = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-escape";
+      ename = "evil-escape";
+      version = "3.16";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-escape-3.16.tar";
+        sha256 = "0vv6k3zaaw4ckk6qjiw1n41815w1g4qgy2hfgsj1vm7xc9i9zjzp";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-escape.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-exchange = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-exchange";
+      ename = "evil-exchange";
+      version = "0.41";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-exchange-0.41.tar";
+        sha256 = "1yk7zdxl7c8c2ic37l0rsaynnpcrhdbblk2frl5m8phf54g82d8i";
+      };
+      packageRequires = [
+        cl-lib
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-exchange.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-goggles = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-goggles";
+      ename = "evil-goggles";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar";
+        sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch";
+      };
+      packageRequires = [
+        emacs
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-goggles.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-iedit-state = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      iedit,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-iedit-state";
+      ename = "evil-iedit-state";
+      version = "1.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar";
+        sha256 = "1955bci018rpbdvixlw0gxay10g0vgg2xwsfmfyxcblk5glrv5cp";
+      };
+      packageRequires = [
+        evil
+        iedit
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-indent-plus = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-indent-plus";
+      ename = "evil-indent-plus";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-indent-plus-1.0.1.tar";
+        sha256 = "1kzlvi8xgfxy26w1m31nyh6vrq787vchkmk4r1xaphk9wn9bw1pq";
+      };
+      packageRequires = [
+        cl-lib
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-indent-plus.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-lisp-state = callPackage (
+    {
+      bind-map,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+      smartparens,
+    }:
+    elpaBuild {
+      pname = "evil-lisp-state";
+      ename = "evil-lisp-state";
+      version = "8.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-lisp-state-8.2.tar";
+        sha256 = "14v1nv797b4rxxxnvzwy6pp10g3mmvifb919iv7nx96sbn919w0p";
+      };
+      packageRequires = [
+        bind-map
+        evil
+        smartparens
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-lisp-state.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-matchit = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-matchit";
+      ename = "evil-matchit";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar";
+        sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-matchit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-nerd-commenter = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-nerd-commenter";
+      ename = "evil-nerd-commenter";
+      version = "3.6.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar";
+        sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-nerd-commenter.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-numbers = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-numbers";
+      ename = "evil-numbers";
+      version = "0.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar";
+        sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i";
+      };
+      packageRequires = [
+        emacs
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-numbers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-surround = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-surround";
+      ename = "evil-surround";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar";
+        sha256 = "1fzhqg2zrfl1yvhf96s5m0b9793cysciqbxiihxzrnnf2rnrlls2";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-surround.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-visual-mark-mode = callPackage (
+    {
+      dash,
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-visual-mark-mode";
+      ename = "evil-visual-mark-mode";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar";
+        sha256 = "0hjg9jmyhhc6a6zzjicwy62m9bh7wlw6hc4cf2g6g416c0ri2d18";
+      };
+      packageRequires = [
+        dash
+        evil
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  evil-visualstar = callPackage (
+    {
+      elpaBuild,
+      evil,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "evil-visualstar";
+      ename = "evil-visualstar";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/evil-visualstar-0.2.0.tar";
+        sha256 = "03liavxxpawvlgwdsihzz3z08yv227zjjqyll1cbmbk0678kbl7m";
+      };
+      packageRequires = [ evil ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/evil-visualstar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  exec-path-from-shell = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "exec-path-from-shell";
+      ename = "exec-path-from-shell";
+      version = "2.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar";
+        sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/exec-path-from-shell.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flx = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flx";
+      ename = "flx";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar";
+        sha256 = "00d3q238grxcvnx6pshb7ajbz559gfp00pqaq56r2n5xqrvrxfnc";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flx.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flx-ido = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      flx,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flx-ido";
+      ename = "flx-ido";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar";
+        sha256 = "1933d3dcwynzs5qnv3pl4xdybj5gg0sa8zb58j0ld9hyiacm6zn5";
+      };
+      packageRequires = [
+        cl-lib
+        flx
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flx-ido.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flycheck = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flycheck";
+      ename = "flycheck";
+      version = "34.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar";
+        sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flycheck.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-guile = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      flymake ? null,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-guile";
+      ename = "flymake-guile";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar";
+        sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k";
+      };
+      packageRequires = [
+        emacs
+        flymake
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-guile.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-kondor = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "flymake-kondor";
+      ename = "flymake-kondor";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar";
+        sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-kondor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  flymake-popon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      flymake ? null,
+      lib,
+      popon,
+      posframe,
+    }:
+    elpaBuild {
+      pname = "flymake-popon";
+      ename = "flymake-popon";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar";
+        sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s";
+      };
+      packageRequires = [
+        emacs
+        flymake
+        popon
+        posframe
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/flymake-popon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  focus = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "focus";
+      ename = "focus";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar";
+        sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/focus.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  forth-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "forth-mode";
+      ename = "forth-mode";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar";
+        sha256 = "04xcvjzvl4pgx48l2pzil7s2iqqbf86z57wv76ahp4sd1xigpfqc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/forth-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  free-keys = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "free-keys";
+      ename = "free-keys";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar";
+        sha256 = "04x4hmia5rx6bd8pkp5b9g4mn081r14vyk1jbdygdzr5w5rhifx3";
+      };
+      packageRequires = [ cl-lib ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/free-keys.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gc-buffers = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gc-buffers";
+      ename = "gc-buffers";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar";
+        sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gc-buffers.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "geiser";
+      ename = "geiser";
+      version = "0.31";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
+        sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
+      };
+      packageRequires = [
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-chez = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-chez";
+      ename = "geiser-chez";
+      version = "0.18";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar";
+        sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-chez.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-chibi = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-chibi";
+      ename = "geiser-chibi";
+      version = "0.17";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar";
+        sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-chibi.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-chicken = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-chicken";
+      ename = "geiser-chicken";
+      version = "0.17";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar";
+        sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-chicken.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-gambit = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-gambit";
+      ename = "geiser-gambit";
+      version = "0.18.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar";
+        sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-gambit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-gauche = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-gauche";
+      ename = "geiser-gauche";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar";
+        sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-gauche.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-guile = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "geiser-guile";
+      ename = "geiser-guile";
+      version = "0.28.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar";
+        sha256 = "148bvwcppv0qk7yh38c0m36hldw58cqhbyniyzwffagmlg0yqzsb";
+      };
+      packageRequires = [
+        emacs
+        geiser
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-kawa = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-kawa";
+      ename = "geiser-kawa";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar";
+        sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-kawa.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-mit = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-mit";
+      ename = "geiser-mit";
+      version = "0.15";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar";
+        sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-mit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-racket = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-racket";
+      ename = "geiser-racket";
+      version = "0.16";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar";
+        sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-racket.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  geiser-stklos = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      geiser,
+      lib,
+    }:
+    elpaBuild {
+      pname = "geiser-stklos";
+      ename = "geiser-stklos";
+      version = "1.8";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar";
+        sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s";
+      };
+      packageRequires = [
+        emacs
+        geiser
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/geiser-stklos.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  git-commit = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      transient,
+      with-editor,
+    }:
+    elpaBuild {
+      pname = "git-commit";
+      ename = "git-commit";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar";
+        sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx";
+      };
+      packageRequires = [
+        dash
+        emacs
+        transient
+        with-editor
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/git-commit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  git-modes = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "git-modes";
+      ename = "git-modes";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar";
+        sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/git-modes.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-apl-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-apl-mode";
+      ename = "gnu-apl-mode";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar";
+        sha256 = "0hzdmrhrcnq49cklpmbx1sq7d9qd2q6pprgshhhjx45mnn1q24v0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnu-indent = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnu-indent";
+      ename = "gnu-indent";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar";
+        sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnu-indent.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gnuplot = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gnuplot";
+      ename = "gnuplot";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar";
+        sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gnuplot.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  go-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "go-mode";
+      ename = "go-mode";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar";
+        sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/go-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  golden-ratio = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "golden-ratio";
+      ename = "golden-ratio";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/golden-ratio-1.0.1.tar";
+        sha256 = "169jl82906k03vifks0zs4sk5gcxax5jii6nysh6y6ns2h656cqx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/golden-ratio.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gotham-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gotham-theme";
+      ename = "gotham-theme";
+      version = "1.1.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar";
+        sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gotham-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  goto-chg = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "goto-chg";
+      ename = "goto-chg";
+      version = "1.7.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar";
+        sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/goto-chg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gptel = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      transient,
+    }:
+    elpaBuild {
+      pname = "gptel";
+      ename = "gptel";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar";
+        sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4";
+      };
+      packageRequires = [
+        compat
+        emacs
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gptel.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  graphql-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "graphql-mode";
+      ename = "graphql-mode";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar";
+        sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/graphql-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gruber-darker-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gruber-darker-theme";
+      ename = "gruber-darker-theme";
+      version = "0.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar";
+        sha256 = "1ib9ad120g39fbkj41am6khglv1p6g3a9hk2jj2kl0c6czr1il2r";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  gruvbox-theme = callPackage (
+    {
+      autothemer,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "gruvbox-theme";
+      ename = "gruvbox-theme";
+      version = "1.30.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar";
+        sha256 = "1y30aahdxzdfmj021vbrz4zmdq6lr9k08hna9i1a8g4cywgbz8ri";
+      };
+      packageRequires = [ autothemer ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/gruvbox-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  guru-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "guru-mode";
+      ename = "guru-mode";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar";
+        sha256 = "0kmbllzvp8qzj8ck2azq2wfw66ywc80zicncja62bi6zsh2l622z";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/guru-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  haml-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "haml-mode";
+      ename = "haml-mode";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar";
+        sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/haml-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  haskell-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "haskell-mode";
+      ename = "haskell-mode";
+      version = "17.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar";
+        sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/haskell-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  haskell-tng-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "haskell-tng-mode";
+      ename = "haskell-tng-mode";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar";
+        sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  helm = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      helm-core,
+      lib,
+      wfnames,
+    }:
+    elpaBuild {
+      pname = "helm";
+      ename = "helm";
+      version = "3.9.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar";
+        sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0";
+      };
+      packageRequires = [
+        helm-core
+        wfnames
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/helm.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  helm-core = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "helm-core";
+      ename = "helm-core";
+      version = "3.9.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
+        sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
+      };
+      packageRequires = [
+        async
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/helm-core.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hideshowvis = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hideshowvis";
+      ename = "hideshowvis";
+      version = "0.8";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar";
+        sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hideshowvis.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  highlight-parentheses = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "highlight-parentheses";
+      ename = "highlight-parentheses";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar";
+        sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hl-block-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hl-block-mode";
+      ename = "hl-block-mode";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar";
+        sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hl-block-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hl-column = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "hl-column";
+      ename = "hl-column";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar";
+        sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hl-column.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  htmlize = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "htmlize";
+      ename = "htmlize";
+      version = "1.56";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar";
+        sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/htmlize.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  hyperdrive = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      map,
+      persist,
+      plz,
+      taxy-magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "hyperdrive";
+      ename = "hyperdrive";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar";
+        sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw";
+      };
+      packageRequires = [
+        compat
+        emacs
+        map
+        persist
+        plz
+        taxy-magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/hyperdrive.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  idle-highlight-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "idle-highlight-mode";
+      ename = "idle-highlight-mode";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar";
+        sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/idle-highlight-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  idris-mode = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      prop-menu,
+    }:
+    elpaBuild {
+      pname = "idris-mode";
+      ename = "idris-mode";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/idris-mode-1.1.0.tar";
+        sha256 = "1vlm7gshrkwp9lfm5jcp1rnsjxwzqknrjhl3q5ifwmicyvqkqwsv";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        prop-menu
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/idris-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  iedit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "iedit";
+      ename = "iedit";
+      version = "0.9.9.9.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar";
+        sha256 = "12s71yj8ycrls2fl97qs3igk5y06ksbmfq2idz0a2zrdggndg0b6";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/iedit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inf-clojure = callPackage (
+    {
+      clojure-mode,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inf-clojure";
+      ename = "inf-clojure";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
+        sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb";
+      };
+      packageRequires = [
+        clojure-mode
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/inf-clojure.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inf-ruby = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inf-ruby";
+      ename = "inf-ruby";
+      version = "2.8.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar";
+        sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/inf-ruby.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  inkpot-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "inkpot-theme";
+      ename = "inkpot-theme";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar";
+        sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/inkpot-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  iwindow = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "iwindow";
+      ename = "iwindow";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar";
+        sha256 = "04d5dxqazxfx8ap9vmhj643x7lmpa0wmzcm9w9mlvsk2kaz0j19i";
+      };
+      packageRequires = [
+        compat
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/iwindow.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  j-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "j-mode";
+      ename = "j-mode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar";
+        sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/j-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jade-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jade-mode";
+      ename = "jade-mode";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar";
+        sha256 = "0pv0n9vharda92avggd91q8i98yjim9ccnz5m5c5xw12hxcsfj17";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jade-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  jinja2-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "jinja2-mode";
+      ename = "jinja2-mode";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/jinja2-mode-0.3.tar";
+        sha256 = "0dg1zn7mghclnxsmcl5nq5jqibm18sja23058q9lk6nph4fvz5dq";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/jinja2-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  julia-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "julia-mode";
+      ename = "julia-mode";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar";
+        sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/julia-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  keycast = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "keycast";
+      ename = "keycast";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar";
+        sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/keycast.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  kotlin-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "kotlin-mode";
+      ename = "kotlin-mode";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar";
+        sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/kotlin-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lorem-ipsum = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lorem-ipsum";
+      ename = "lorem-ipsum";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar";
+        sha256 = "0d1c6zalnqhyn88dbbi8wqzvp0ppswhqv656hbj129jwp4iida4x";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  lua-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "lua-mode";
+      ename = "lua-mode";
+      version = "20221027";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar";
+        sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/lua-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  macrostep = callPackage (
+    {
+      cl-lib ? null,
+      compat,
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "macrostep";
+      ename = "macrostep";
+      version = "0.9.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar";
+        sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk";
+      };
+      packageRequires = [
+        cl-lib
+        compat
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/macrostep.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  magit = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      git-commit,
+      lib,
+      magit-section,
+      transient,
+      with-editor,
+    }:
+    elpaBuild {
+      pname = "magit";
+      ename = "magit";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar";
+        sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z";
+      };
+      packageRequires = [
+        dash
+        emacs
+        git-commit
+        magit-section
+        transient
+        with-editor
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/magit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  magit-section = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "magit-section";
+      ename = "magit-section";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar";
+        sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/magit-section.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  markdown-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "markdown-mode";
+      ename = "markdown-mode";
+      version = "2.6";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar";
+        sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/markdown-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mastodon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      persist,
+      request,
+    }:
+    elpaBuild {
+      pname = "mastodon";
+      ename = "mastodon";
+      version = "1.0.24";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar";
+        sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023";
+      };
+      packageRequires = [
+        emacs
+        persist
+        request
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mastodon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  material-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "material-theme";
+      ename = "material-theme";
+      version = "2015";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar";
+        sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/material-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mentor = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+      url-scgi,
+      xml-rpc,
+    }:
+    elpaBuild {
+      pname = "mentor";
+      ename = "mentor";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar";
+        sha256 = "1sqdwdbanrdvrr8qqn23ylcyc98jcjc7yq1g1d963v8d9wfbailv";
+      };
+      packageRequires = [
+        async
+        emacs
+        seq
+        url-scgi
+        xml-rpc
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mentor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  meow = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "meow";
+      ename = "meow";
+      version = "1.4.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar";
+        sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/meow.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  minibar = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "minibar";
+      ename = "minibar";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar";
+        sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/minibar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  moe-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "moe-theme";
+      ename = "moe-theme";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar";
+        sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/moe-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  monokai-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "monokai-theme";
+      ename = "monokai-theme";
+      version = "3.5.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/monokai-theme-3.5.3.tar";
+        sha256 = "14ylizbhfj2hlc52gi2fs70avz39s46wnr96dbbq4l8vmhxs7il5";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/monokai-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  mpv = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      json ? null,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "mpv";
+      ename = "mpv";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/mpv-0.2.0.tar";
+        sha256 = "183alhd5fvmlhhfm0wl7b50axs01pgiwv735c43bfzdi2ny4szcm";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        json
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/mpv.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  multiple-cursors = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "multiple-cursors";
+      ename = "multiple-cursors";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar";
+        sha256 = "0452wrbwg8hyvsri99h71g04dll5w65na265pp9whphq6l06ikrx";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/multiple-cursors.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nasm-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nasm-mode";
+      ename = "nasm-mode";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar";
+        sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nasm-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nginx-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "nginx-mode";
+      ename = "nginx-mode";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.10.tar";
+        sha256 = "0c6biqxbwpkrbqi639ifgv8jkfadssyznjkq6hxvqgjh3nnyrlx3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nginx-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  nix-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      magit-section,
+      transient,
+    }:
+    elpaBuild {
+      pname = "nix-mode";
+      ename = "nix-mode";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar";
+        sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g";
+      };
+      packageRequires = [
+        emacs
+        magit-section
+        transient
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/nix-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  oblivion-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "oblivion-theme";
+      ename = "oblivion-theme";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar";
+        sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/oblivion-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  opam-switch-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "opam-switch-mode";
+      ename = "opam-switch-mode";
+      version = "1.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar";
+        sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-auto-tangle = callPackage (
+    {
+      async,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-auto-tangle";
+      ename = "org-auto-tangle";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar";
+        sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd";
+      };
+      packageRequires = [
+        async
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-contrib = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-contrib";
+      ename = "org-contrib";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar";
+        sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-contrib.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-drill = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+      persist,
+      seq,
+    }:
+    elpaBuild {
+      pname = "org-drill";
+      ename = "org-drill";
+      version = "2.7.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-drill-2.7.0.tar";
+        sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg";
+      };
+      packageRequires = [
+        emacs
+        org
+        persist
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-drill.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-journal = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-journal";
+      ename = "org-journal";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar";
+        sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-journal.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-mime = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-mime";
+      ename = "org-mime";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar";
+        sha256 = "1r24inqadhlsqc896vlm10bhr76aj6hnm6q5snhzpz4kk9j0gybd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-mime.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-present = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-present";
+      ename = "org-present";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-present-0.1.tar";
+        sha256 = "18zrvrd9aih57gj14qmxv9rf5j859vkvxcni3fkdbj84y5pq2fpy";
+      };
+      packageRequires = [ org ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-present.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-superstar = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org,
+    }:
+    elpaBuild {
+      pname = "org-superstar";
+      ename = "org-superstar";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar";
+        sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g";
+      };
+      packageRequires = [
+        emacs
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-superstar.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-transclusion-http = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      org-transclusion,
+      plz,
+    }:
+    elpaBuild {
+      pname = "org-transclusion-http";
+      ename = "org-transclusion-http";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-transclusion-http-0.4.tar";
+        sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr";
+      };
+      packageRequires = [
+        emacs
+        org-transclusion
+        plz
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-transclusion-http.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  org-tree-slide = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "org-tree-slide";
+      ename = "org-tree-slide";
+      version = "2.8.22";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar";
+        sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/org-tree-slide.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  orgit = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      magit,
+      org,
+    }:
+    elpaBuild {
+      pname = "orgit";
+      ename = "orgit";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/orgit-1.9.0.tar";
+        sha256 = "0g0nr284lgmd6jmk0w412gcildl6fzxv9kskgzr7ksk09qk9qfll";
+      };
+      packageRequires = [
+        compat
+        emacs
+        magit
+        org
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/orgit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  p4-16-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "p4-16-mode";
+      ename = "p4-16-mode";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/p4-16-mode-0.3.tar";
+        sha256 = "1kwfqs7ikfjkkpv3m440ak40mjyf493gqygmc4hac8phlf9ns6dv";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/p4-16-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  package-lint = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      let-alist,
+      lib,
+    }:
+    elpaBuild {
+      pname = "package-lint";
+      ename = "package-lint";
+      version = "0.23";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar";
+        sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg";
+      };
+      packageRequires = [
+        emacs
+        let-alist
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/package-lint.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pacmacs = callPackage (
+    {
+      dash,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pacmacs";
+      ename = "pacmacs";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar";
+        sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9";
+      };
+      packageRequires = [
+        dash
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pacmacs.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  page-break-lines = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "page-break-lines";
+      ename = "page-break-lines";
+      version = "0.15";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar";
+        sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/page-break-lines.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  paredit = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "paredit";
+      ename = "paredit";
+      version = "26";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/paredit-26.tar";
+        sha256 = "1sk8nhsysa3y8fvds67cbwwzivzxlyw8d81y7f7pqc5lflidjrpc";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/paredit.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parseclj = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "parseclj";
+      ename = "parseclj";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar";
+        sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/parseclj.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  parseedn = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      map,
+      parseclj,
+    }:
+    elpaBuild {
+      pname = "parseedn";
+      ename = "parseedn";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.1.tar";
+        sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak";
+      };
+      packageRequires = [
+        emacs
+        map
+        parseclj
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/parseedn.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pcmpl-args = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pcmpl-args";
+      ename = "pcmpl-args";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar";
+        sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pcmpl-args.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pcre2el = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "pcre2el";
+      ename = "pcre2el";
+      version = "1.12";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar";
+        sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pcre2el.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  pdf-tools = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      let-alist,
+      lib,
+      tablist,
+    }:
+    elpaBuild {
+      pname = "pdf-tools";
+      ename = "pdf-tools";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.1.0.tar";
+        sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc";
+      };
+      packageRequires = [
+        emacs
+        let-alist
+        tablist
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/pdf-tools.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  php-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "php-mode";
+      ename = "php-mode";
+      version = "1.25.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar";
+        sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/php-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  popon = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "popon";
+      ename = "popon";
+      version = "0.13";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar";
+        sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/popon.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  popup = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "popup";
+      ename = "popup";
+      version = "0.5.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar";
+        sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/popup.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  projectile = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "projectile";
+      ename = "projectile";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar";
+        sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/projectile.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  proof-general = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "proof-general";
+      ename = "proof-general";
+      version = "4.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar";
+        sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/proof-general.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  prop-menu = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "prop-menu";
+      ename = "prop-menu";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar";
+        sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/prop-menu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  racket-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "racket-mode";
+      ename = "racket-mode";
+      version = "1.0.20240621.124732";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar";
+        sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/racket-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rainbow-delimiters = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rainbow-delimiters";
+      ename = "rainbow-delimiters";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/rainbow-delimiters-2.1.5.tar";
+        sha256 = "0f4zhz92z5qk3p9ips2d76qi64xv6y8jrxh5nvbq46ivj5c0hnw2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rainbow-delimiters.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  raku-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "raku-mode";
+      ename = "raku-mode";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar";
+        sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/raku-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  recomplete = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "recomplete";
+      ename = "recomplete";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar";
+        sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/recomplete.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  reformatter = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "reformatter";
+      ename = "reformatter";
+      version = "0.8";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar";
+        sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/reformatter.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  request = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "request";
+      ename = "request";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar";
+        sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/request.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rfc-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rfc-mode";
+      ename = "rfc-mode";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar";
+        sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rfc-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rubocop = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rubocop";
+      ename = "rubocop";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar";
+        sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rubocop.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  rust-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "rust-mode";
+      ename = "rust-mode";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar";
+        sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/rust-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sass-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      haml-mode,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sass-mode";
+      ename = "sass-mode";
+      version = "3.0.16";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar";
+        sha256 = "0ag7qi9dq4j23ywbwni7pblp6l1ik95vjhclxm82s1911a8m7pj2";
+      };
+      packageRequires = [ haml-mode ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sass-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scad-mode = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scad-mode";
+      ename = "scad-mode";
+      version = "94.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar";
+        sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scad-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scala-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scala-mode";
+      ename = "scala-mode";
+      version = "0.23";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar";
+        sha256 = "1zwd9cajw90v25rwdlylhdrc1xwvnf74c2rckz3cs096xsxc1qx2";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scala-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scroll-on-drag = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scroll-on-drag";
+      ename = "scroll-on-drag";
+      version = "0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar";
+        sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scroll-on-drag.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  scroll-on-jump = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "scroll-on-jump";
+      ename = "scroll-on-jump";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar";
+        sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/scroll-on-jump.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sesman = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sesman";
+      ename = "sesman";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar";
+        sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sesman.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  shellcop = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "shellcop";
+      ename = "shellcop";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar";
+        sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/shellcop.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  slime = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      macrostep,
+    }:
+    elpaBuild {
+      pname = "slime";
+      ename = "slime";
+      version = "2.30";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar";
+        sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f";
+      };
+      packageRequires = [
+        emacs
+        macrostep
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/slime.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sly = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sly";
+      ename = "sly";
+      version = "1.0.43";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar";
+        sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sly.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  smartparens = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "smartparens";
+      ename = "smartparens";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar";
+        sha256 = "0kvlyx2bhw4q6k79wf5cm4srlmfncsbii4spdgafwmv8j7vw6ya3";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/smartparens.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  solarized-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "solarized-theme";
+      ename = "solarized-theme";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar";
+        sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/solarized-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spacemacs-theme = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spacemacs-theme";
+      ename = "spacemacs-theme";
+      version = "0.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/spacemacs-theme-0.2.tar";
+        sha256 = "07lkaj6gm5iz503p5l6sm1y62mc5wk13nrwzv81f899jw99jcgml";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/spacemacs-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  spell-fu = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "spell-fu";
+      ename = "spell-fu";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar";
+        sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/spell-fu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sqlite3 = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sqlite3";
+      ename = "sqlite3";
+      version = "0.17";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar";
+        sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sqlite3.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  stylus-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "stylus-mode";
+      ename = "stylus-mode";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar";
+        sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/stylus-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  subatomic-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "subatomic-theme";
+      ename = "subatomic-theme";
+      version = "1.8.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar";
+        sha256 = "0vpaswm5mdyb8cir160mb8ffgzaz7kbq3gvc2zrnh531zb994mqg";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/subatomic-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  subed = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "subed";
+      ename = "subed";
+      version = "1.2.14";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
+        sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/subed.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  sweeprolog = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "sweeprolog";
+      ename = "sweeprolog";
+      version = "0.27.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar";
+        sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/sweeprolog.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  swift-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "swift-mode";
+      ename = "swift-mode";
+      version = "9.1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar";
+        sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv";
+      };
+      packageRequires = [
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/swift-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  swsw = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "swsw";
+      ename = "swsw";
+      version = "2.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/swsw-2.3.tar";
+        sha256 = "0qwdv174bh9k1bpd5szzmhk7hw89xf7rz2i2hzdrmlpvcs3ps653";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/swsw.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  symbol-overlay = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "symbol-overlay";
+      ename = "symbol-overlay";
+      version = "4.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar";
+        sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/symbol-overlay.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  systemd = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "systemd";
+      ename = "systemd";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar";
+        sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/systemd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tablist = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tablist";
+      ename = "tablist";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar";
+        sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tablist.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tangotango-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tangotango-theme";
+      ename = "tangotango-theme";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/tangotango-theme-0.0.7.tar";
+        sha256 = "1w287p8lpmkm80qy1di2xmd71k051qmg89cn7s21kgi4br3hbbph";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tangotango-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  telephone-line = callPackage (
+    {
+      cl-generic,
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      seq,
+    }:
+    elpaBuild {
+      pname = "telephone-line";
+      ename = "telephone-line";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/telephone-line-0.5.tar";
+        sha256 = "0pmn1r2g639c8g3rw5q2d5cgdz79d4ipr3r4dzwx2mgff3ri1ylm";
+      };
+      packageRequires = [
+        cl-generic
+        cl-lib
+        emacs
+        seq
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/telephone-line.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  testcover-mark-line = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "testcover-mark-line";
+      ename = "testcover-mark-line";
+      version = "0.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar";
+        sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  textile-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "textile-mode";
+      ename = "textile-mode";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar";
+        sha256 = "02nc3wijsb626631m09f2ygpmimkbl46x5hi8yk0wl18y66yq972";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/textile-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  toc-org = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "toc-org";
+      ename = "toc-org";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/toc-org-1.1.tar";
+        sha256 = "0qhkn1a4j1q5gflqlyha2534sms8xsx03i7dizrckhl368yznwan";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/toc-org.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  totp-auth = callPackage (
+    {
+      base32,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "totp-auth";
+      ename = "totp-auth";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar";
+        sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5";
+      };
+      packageRequires = [
+        base32
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/totp-auth.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  treeview = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "treeview";
+      ename = "treeview";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar";
+        sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/treeview.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  tuareg = callPackage (
+    {
+      caml,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "tuareg";
+      ename = "tuareg";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar";
+        sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj";
+      };
+      packageRequires = [
+        caml
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/tuareg.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  typescript-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "typescript-mode";
+      ename = "typescript-mode";
+      version = "0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar";
+        sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/typescript-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ujelly-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ujelly-theme";
+      ename = "ujelly-theme";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar";
+        sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ujelly-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  undo-fu = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "undo-fu";
+      ename = "undo-fu";
+      version = "0.5";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar";
+        sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/undo-fu.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  undo-fu-session = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "undo-fu-session";
+      ename = "undo-fu-session";
+      version = "0.7";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar";
+        sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/undo-fu-session.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vc-fossil = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vc-fossil";
+      ename = "vc-fossil";
+      version = "20230504";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/vc-fossil-20230504.tar";
+        sha256 = "1q78xcfzpvvrlr9b9yh57asrlks2n0nhxhxl8dyfwad6gm0yr948";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vc-fossil.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  vcomplete = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "vcomplete";
+      ename = "vcomplete";
+      version = "2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar";
+        sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/vcomplete.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  visual-fill-column = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "visual-fill-column";
+      ename = "visual-fill-column";
+      version = "2.6.3";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar";
+        sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/visual-fill-column.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  web-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "web-mode";
+      ename = "web-mode";
+      version = "17.3.19";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar";
+        sha256 = "0gmi0p118kd2xvlbp6y5mz2f0sgdm8qwna76lrmbnsxw4c9g5c6p";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/web-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  webpaste = callPackage (
+    {
+      cl-lib ? null,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      request,
+    }:
+    elpaBuild {
+      pname = "webpaste";
+      ename = "webpaste";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/webpaste-3.2.2.tar";
+        sha256 = "04156iwgbc49l3b6s5vzbffw1xrkansvczi6q29d5waxwi6a2nfc";
+      };
+      packageRequires = [
+        cl-lib
+        emacs
+        request
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/webpaste.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wfnames = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wfnames";
+      ename = "wfnames";
+      version = "1.2";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar";
+        sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wfnames.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  wgrep = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "wgrep";
+      ename = "wgrep";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar";
+        sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/wgrep.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  why-this = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "why-this";
+      ename = "why-this";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar";
+        sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/why-this.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  with-editor = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "with-editor";
+      ename = "with-editor";
+      version = "3.3.4";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar";
+        sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc";
+      };
+      packageRequires = [
+        compat
+        emacs
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/with-editor.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  with-simulated-input = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "with-simulated-input";
+      ename = "with-simulated-input";
+      version = "3.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar";
+        sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/with-simulated-input.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  workroom = callPackage (
+    {
+      compat,
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      project,
+    }:
+    elpaBuild {
+      pname = "workroom";
+      ename = "workroom";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar";
+        sha256 = "0k0npmcs3cdkfds0r8p0gm8xa42bzdjiciilh65jka15fqknx486";
+      };
+      packageRequires = [
+        compat
+        emacs
+        project
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/workroom.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  writegood-mode = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "writegood-mode";
+      ename = "writegood-mode";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar";
+        sha256 = "00phrzbd03gzc5y2ybizyp9smd6ybmmx2j7jf6hg5cmfyjmq8ahw";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/writegood-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  ws-butler = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "ws-butler";
+      ename = "ws-butler";
+      version = "0.6";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar";
+        sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/ws-butler.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xah-fly-keys = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xah-fly-keys";
+      ename = "xah-fly-keys";
+      version = "25.9.20240703220947";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar";
+        sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xkcd = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      json ? null,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xkcd";
+      ename = "xkcd";
+      version = "1.1";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar";
+        sha256 = "1qs4jv6h2i8g7s214xr4s6jgykdbac4lfc5hd0gmylkwlvs3pzcp";
+      };
+      packageRequires = [ json ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xkcd.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  xml-rpc = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "xml-rpc";
+      ename = "xml-rpc";
+      version = "1.6.17";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar";
+        sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/xml-rpc.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yaml-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "yaml-mode";
+      ename = "yaml-mode";
+      version = "0.0.16";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar";
+        sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7";
+      };
+      packageRequires = [ emacs ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/yaml-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  yasnippet-snippets = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+      yasnippet,
+    }:
+    elpaBuild {
+      pname = "yasnippet-snippets";
+      ename = "yasnippet-snippets";
+      version = "1.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar";
+        sha256 = "0si61d0niabh18vbgdz6w5zirpxpp7c4mrcn5x1n3r5vnhv3n7m2";
+      };
+      packageRequires = [ yasnippet ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zenburn-theme = callPackage (
+    {
+      elpaBuild,
+      fetchurl,
+      lib,
+    }:
+    elpaBuild {
+      pname = "zenburn-theme";
+      ename = "zenburn-theme";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.8.0.tar";
+        sha256 = "0z733svsjsads655jgmc0b33icmygwaahxa27qi32s1pq84zqb4z";
+      };
+      packageRequires = [ ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/zenburn-theme.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+  zig-mode = callPackage (
+    {
+      elpaBuild,
+      emacs,
+      fetchurl,
+      lib,
+      reformatter,
+    }:
+    elpaBuild {
+      pname = "zig-mode";
+      ename = "zig-mode";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar";
+        sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87";
+      };
+      packageRequires = [
+        emacs
+        reformatter
+      ];
+      meta = {
+        homepage = "https://elpa.gnu.org/packages/zig-mode.html";
+        license = lib.licenses.free;
+      };
+    }
+  ) { };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-elpa b/pkgs/applications/editors/emacs/elisp-packages/update-elpa
index ba2964b2ead09..6cf3bafd24e16 100755
--- a/pkgs/applications/editors/emacs/elisp-packages/update-elpa
+++ b/pkgs/applications/editors/emacs/elisp-packages/update-elpa
@@ -1,4 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell --show-trace ./emacs2nix.nix -i bash
 
-exec elpa-packages.sh --names $EMACS2NIX/names.nix -o elpa-generated.nix
+output="elpa-generated.nix"
+elpa-packages.sh --names $EMACS2NIX/names.nix -o "$output"
+nixfmt "$output"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel b/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel
index b5af44424763c..356d93167af88 100755
--- a/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel
+++ b/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel
@@ -1,4 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell --show-trace ./emacs2nix.nix -i bash
 
-exec elpa-devel-packages.sh --names $EMACS2NIX/names.nix -o elpa-devel-generated.nix
+output="elpa-devel-generated.nix"
+elpa-devel-packages.sh --names $EMACS2NIX/names.nix -o "$output"
+nixfmt "$output"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
index 1344bb380c01e..5879f4e3eab56 100755
--- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
+++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
@@ -33,8 +33,10 @@ download_change "elpa/elpa-generated.nix"
 download_change "elpa/elpa-devel-generated.nix"
 download_change "melpa/recipes-archive-melpa.json"
 download_change "nongnu/nongnu-generated.nix"
+download_change "nongnu/nongnu-devel-generated.nix"
 
 test_packageset "nongnuPackages"
+test_packageset "nongnuDevelPackages"
 test_packageset "elpaPackages"
 test_packageset "elpaDevelPackages"
 test_packageset "melpaStablePackages"
@@ -44,3 +46,4 @@ commit_change "elpa-packages" "elpa-generated.nix"
 commit_change "elpa-devel-packages" "elpa-devel-generated.nix"
 commit_change "melpa-packages" "recipes-archive-melpa.json"
 commit_change "nongnu-packages" "nongnu-generated.nix"
+commit_change "nongnu-devel-packages" "nongnu-devel-generated.nix"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
index dc43a86efbe3d..9a4b20716c152 100755
--- a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
+++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
@@ -1,4 +1,6 @@
 #! /usr/bin/env nix-shell
 #! nix-shell --show-trace ./emacs2nix.nix -i bash
 
-exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix
+output="nongnu-generated.nix"
+nongnu-packages.sh --names $EMACS2NIX/names.nix -o "$output"
+nixfmt "$output"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel
new file mode 100755
index 0000000000000..a1f5f950d4387
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel
@@ -0,0 +1,6 @@
+#! /usr/bin/env nix-shell
+#! nix-shell --show-trace ./emacs2nix.nix -i bash
+
+output="nongnu-devel-generated.nix"
+nongnu-devel-packages.sh --names $EMACS2NIX/names.nix -o "$output"
+nixfmt "$output"
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index ae541b8dd7685..09caf3a271f3f 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = "https://flpsed.org/flpsed.html";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "flpsed";
   };
 }
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 17291a458a4b5..a4d9905d6fa7a 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/LonnyGomes/hexcurse";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "hexcurse";
   };
 }
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 363466e160d0b..a72bac0c27c2d 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://hte.sourceforge.net";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ht";
   };
 }
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index b30e1f59764e7..317b2b6b87c96 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Vim inspired text editor";
     license = licenses.publicDomain;
     mainProgram = "kak";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix
index d2203a714c374..bcf20e4af55de 100644
--- a/pkgs/applications/editors/l3afpad/default.nix
+++ b/pkgs/applications/editors/l3afpad/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Simple text editor forked from Leafpad using GTK+ 3.x";
     homepage = "https://github.com/stevenhoneyman/l3afpad";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2;
     mainProgram = "l3afpad";
   };
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index bd526b8f6ce22..bf2fb1fb02f72 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -205,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Vim - the text editor - for macOS";
     homepage = "https://macvim.org/";
     license = licenses.vim;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.darwin;
     hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile
   };
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index de27c70d1f90c..bf55c4b71f640 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -191,6 +191,17 @@
     };
     meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
   };
+  bqn = buildGrammar {
+    language = "bpn";
+    version = "0.0.0+rev=8c62b74";
+    src = fetchFromGitHub {
+      owner = "shnarazk";
+      repo = "tree-sitter-bqn";
+      rev = "8c62b746924398304c8fa1aa18393c3124d1e50d";
+      hash = "sha256-jK0zn7DWzy2yfYOX1ZBoGOC7QBrcp4PHWnaOKaDL9ws=";
+    };
+    meta.homepage = "https://github.com/shnarazk/tree-sitter-bqn";
+  };
   c = buildGrammar {
     language = "c";
     version = "0.0.0+rev=be23d2c";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 087d59a5c4614..133200a982cc4 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -17,6 +17,7 @@
 , # Misc dependencies
   arrow-cpp
 , Cocoa
+, coc-diagnostic
 , code-minimap
 , dasht
 , deno
@@ -336,6 +337,11 @@
     dependencies = with self; [ nvim-cmp zsh ];
   };
 
+  coc-diagnostic = buildVimPlugin {
+    inherit (coc-diagnostic) pname version meta;
+    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
+  };
+
   coc-nginx = buildVimPlugin {
     pname = "coc-nginx";
     inherit (nodePackages."@yaegassy/coc-nginx") version meta;
@@ -418,12 +424,12 @@
 
   codesnap-nvim =
     let
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchFromGitHub {
         owner = "mistricky";
         repo = "codesnap.nvim";
         rev = "refs/tags/v${version}";
-        hash = "sha256-r6/2pbojfzBdMoZHphE6BX5cEiCAmOWurPBptI6jjcw=";
+        hash = "sha256-3z0poNmS6LOS7/qGTBhvz1Q9WpYC7Wu4rNvHsUXB5ZY=";
       };
       codesnap-lib = rustPlatform.buildRustPackage {
         pname = "codesnap-lib";
@@ -431,7 +437,7 @@
 
         sourceRoot = "${src.name}/generator";
 
-        cargoHash = "sha256-E8EywpyRSoknXSebnvqP178ZgAIahJeD5siD46KM/Mc=";
+        cargoHash = "sha256-u0NvChN50LIxUhmsT4mvWs5xB/TwJkMabggFePA/b1E=";
 
         nativeBuildInputs = [
           pkg-config
@@ -2118,7 +2124,6 @@
       "coc-clangd"
       "coc-cmake"
       "coc-css"
-      "coc-diagnostic"
       "coc-docker"
       "coc-emmet"
       "coc-eslint"
diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
index 4ace5711cd3d9..fc02ebb8d768c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
@@ -26,7 +26,7 @@ let
     homepage = "https://github.com/liuchengxu/vim-clap";
     changelog = "https://github.com/liuchengxu/vim-clap/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 
   maple = rustPlatform.buildRustPackage {
diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md
index 12ac4f5f5bb2e..09de650067fc7 100644
--- a/pkgs/applications/editors/vscode/extensions/README.md
+++ b/pkgs/applications/editors/vscode/extensions/README.md
@@ -31,7 +31,7 @@
   - Naming convention for:
     - Adding a new extension:
 
-      > vscode-extensions.publisher.extension-name: init 1.2.3
+      > vscode-extensions.publisher.extension-name: init at 1.2.3
       >
       > Release: https://github.com/owner/project/releases/tag/1.2.3
     - Updating an extension:
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index adde070d03723..daef61950c658 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1047,26 +1047,26 @@ let
             sources = {
               "x86_64-linux" = {
                 arch = "linux-x64";
-                hash = "sha256-ZlbPRFQwvZNCp8K/rbHqVa3coXa2dT4nOrNChC9naC8=";
+                hash = "sha256-X6Oszc88F0ENABwX63uwxbJ4VPQOQzZbJA87znVg5d8=";
               };
               "x86_64-darwin" = {
                 arch = "darwin-x64";
-                hash = "sha256-hSRdvno8VZNi48rckaqWbAgDXT6RXEcPnkNOT8DV1wA=";
+                hash = "sha256-NH3kGmNZpKofNplw+FRJFvV3m36HRuIqGR3zt6X5x60=";
               };
               "aarch64-linux" = {
                 arch = "linux-arm64";
-                hash = "sha256-rimE7dKT6zajHo6E42z7IyfP35xBXThIwMHhZjaZwHk=";
+                hash = "sha256-hlFAMz17cl2/1CK7/dgrLktcPZYAcccIWIpkAVdwpkI=";
               };
               "aarch64-darwin" = {
                 arch = "darwin-arm64";
-                hash = "sha256-7TeUAZLiEnqi5i5nHLhtv5aMxIcw7iiABOAkwP1YYqM=";
+                hash = "sha256-oVkmdw0sHv5Y+ysT4zWW6qFDh/h4/TcgSAauh1KrE1c=";
               };
             };
           in
           {
             name = "continue";
             publisher = "Continue";
-            version = "0.8.40";
+            version = "0.8.44";
           }
           // sources.${stdenv.system};
         nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
@@ -1099,6 +1099,23 @@ let
         };
       };
 
+      csharpier.csharpier-vscode = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "csharpier-vscode";
+          publisher = "csharpier";
+          version = "1.7.3";
+          hash = "sha256-/ZLjnlLl6xmgEazdCbnuE6UuuV1tDwAjpxz+vmBuYHE=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog";
+          description = "CSharpier code formatter for Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=csharpier.csharpier-vscode";
+          homepage = "https://github.com/belav/csharpier";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.magnouvean ];
+        };
+      };
+
       cweijan.dbclient-jdbc = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "dbclient-jdbc";
@@ -3109,6 +3126,72 @@ let
       ms-dotnettools.csdevkit = callPackage ./ms-dotnettools.csdevkit { };
       ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { };
 
+      ms-dotnettools.vscode-dotnet-runtime = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-dotnet-runtime";
+          publisher = "ms-dotnettools";
+          version = "2.1.1";
+          hash = "sha256-k14bjWITPDduJi79W59SnMV2TFNRCeAymhs6u1Y0vzk=";
+        };
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog";
+          description = "Provides a way for other Visual Studio Code extensions to install local versions of .NET SDK/Runtime";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime";
+          homepage = "https://github.com/dotnet/vscode-dotnet-runtime";
+          license = lib.licenses.mit;
+          maintainers = [ lib.maintainers.magnouvean ];
+        };
+      };
+
+      ms-dotnettools.vscodeintellicode-csharp = buildVscodeMarketplaceExtension {
+        mktplcRef =
+          let
+            sources = {
+              "x86_64-linux" = {
+                arch = "linux-x64";
+                hash = "sha256-oQMwzQuW5vjxtDboRCeiEO5aytsAY6rb14JDTmK3JPg=";
+              };
+              "x86_64-darwin" = {
+                arch = "darwin-x64";
+                hash = "sha256-/9+qtLDNYUFvdoehit3BihA38p6RqJ7na5Q27xxpZk0=";
+              };
+              "aarch64-linux" = {
+                arch = "linux-arm64";
+                hash = "sha256-JqLlYMKyTXaEzuTPPxVaO8WJiuCUN+9xBzyA6+aYdSc=";
+              };
+              "aarch64-darwin" = {
+                arch = "darwin-arm64";
+                hash = "sha256-dhiUePePkO3MxRQ5UP+lOxRax503JlERe/GWJ8pPUIg=";
+              };
+            };
+          in
+          {
+            name = "vscodeintellicode-csharp";
+            publisher = "ms-dotnettools";
+            version = "2.1.11";
+          }
+          // sources.${stdenv.system};
+        nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
+        buildInputs = [
+          stdenv.cc.cc.lib
+          zlib
+        ];
+        meta = {
+          changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscodeintellicode-csharp/changelog";
+          description = "AI-assisted development features for C# in Visual Studio Code";
+          downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscodeintellicode-csharp";
+          homepage = "https://github.com/MicrosoftDocs/intellicode";
+          license = lib.licenses.unfree;
+          maintainers = [ lib.maintainers.magnouvean ];
+          platforms = [
+            "x86_64-linux"
+            "x86_64-darwin"
+            "aarch64-darwin"
+            "aarch64-linux"
+          ];
+        };
+      };
+
       ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vscode-kubernetes-tools";
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index c6124344a7da5..8d665025bba29 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -14,7 +14,7 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-lpMwA5jMr10uV4uIjq9VNOKjqduxXuDZVIIszVIXSGw=";
+        hash = "sha256-yPenOk2sKt3DGmb69Ewbz8YT5KU371wizLdqfHCxBfg=";
         binaries = [
           "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller"
           "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost"
@@ -24,7 +24,7 @@ let
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-OaA3uNvKwbRGqMQqg6YozQF6AXxisO9ndDAFBj7wUEM=";
+        hash = "sha256-zjGyewO5Ss0kBr2GyWa/sBPy1K21MrNsIwzDBjGKlCc=";
         binaries = [
           "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller"
           "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost"
@@ -34,7 +34,7 @@ let
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-o6B6eA4LqoLw1aGvUI95aK3pChyFXK3jUOH5Fpp4/IM=";
+        hash = "sha256-nhX04v+r8IbUJ5Uoryuxvthn07MAoncDr5dxptlv9GM=";
         binaries = [
           "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller"
           "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost"
@@ -44,7 +44,7 @@ let
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-cDv1l57C73UEtSJhTO+xb2sSX8xwepzJYxYuGsNq+r4=";
+        hash = "sha256-IvH2wmaiw/TAMzuaFg+5gsKxjnp+Hi3PQnGLXp1KEHM=";
         binaries = [
           "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller"
           "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost"
@@ -59,7 +59,7 @@ buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csdevkit";
     publisher = "ms-dotnettools";
-    version = "1.7.27";
+    version = "1.8.14";
     inherit (extInfo) hash arch;
   };
   sourceRoot = "extension"; # This has more than one folder.
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 2cbfa504f47a9..9c26f92ca9615 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -29,22 +29,22 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-Y+Re3tDX8HQrWo045JxdX8Jt4jomm1/C9T+BU2/hE+g=";
+        hash = "sha256-uCayu7WU+qqiCDxxfO4j1aOypP+O49uNZMnfwq+hO4k=";
         binaries = linuxBins;
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-nFCFK2GVLljMqmxJnlma6kAXHc9qN/DnnRiWrkjmLmo=";
+        hash = "sha256-b4Q3JWNdZtLlgxMUBpu+5ppJDILxjPHBZeMxsQHiDa0=";
         binaries = linuxBins;
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-hC1ZJdBKJR3om9xuxEBhaBtQXEin1R0t7BFVdOUu6X8=";
+        hash = "sha256-uVI2PmHfhmuQMTCbwrGuLamC1DyjeLCZf41pjT891GE=";
         binaries = darwinBins;
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-mIZJXgACvJmhrJzOtKcF2DKeBkLSjKehE1xEwtp1X+E=";
+        hash = "sha256-zNSvznX7nYTBexlkD49t3Ne66/u3paecZJZwMuPmSf4=";
         binaries = darwinBins ++ [
           ".debugger/arm64/vsdbg-ui"
           ".debugger/arm64/vsdbg"
@@ -57,7 +57,7 @@ buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csharp";
     publisher = "ms-dotnettools";
-    version = "2.34.12";
+    version = "2.39.29";
     inherit (extInfo) hash arch;
   };
 
diff --git a/pkgs/applications/emulators/box86/default.nix b/pkgs/applications/emulators/box86/default.nix
new file mode 100644
index 0000000000000..961188b2df8d1
--- /dev/null
+++ b/pkgs/applications/emulators/box86/default.nix
@@ -0,0 +1,102 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+  cmake,
+  python3,
+  withDynarec ? stdenv.hostPlatform.isAarch32,
+  runCommand,
+  hello-x86_32,
+}:
+
+# Currently only supported on specific archs
+assert withDynarec -> stdenv.hostPlatform.isAarch32;
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "box86";
+  version = "0.3.6";
+
+  src = fetchFromGitHub {
+    owner = "ptitSeb";
+    repo = "box86";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-Ywsf+q7tWcAbrwbE/KvM6AJFNMJvqHKWD6tuANxrUt8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  cmakeFlags =
+    [
+      (lib.cmakeBool "NOGIT" true)
+
+      # Arch mega-option
+      (lib.cmakeBool "POWERPCLE" (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian))
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isi686 [
+      # x86 has no arch-specific mega-option, manually enable the options that apply to it
+      (lib.cmakeBool "LD80BITS" true)
+      (lib.cmakeBool "NOALIGN" true)
+    ]
+    ++ [
+      # Arch dynarec
+      (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch))
+    ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm 0755 box86 "$out/bin/box86"
+
+    runHook postInstall
+  '';
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    echo Checking if it works
+    $out/bin/box86 -v
+
+    echo Checking if Dynarec option was respected
+    $out/bin/box86 -v | grep ${lib.optionalString (!withDynarec) "-v"} Dynarec
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+    tests.hello =
+      runCommand "box86-test-hello" { nativeBuildInputs = [ finalAttrs.finalPackage ]; }
+        # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to
+        # tell what problems the emulator has run into.
+        ''
+          BOX86_NOBANNER=0 BOX86_LOG=1 box86 ${lib.getExe hello-x86_32} --version | tee $out
+        '';
+  };
+
+  meta = {
+    homepage = "https://box86.org/";
+    description = "Lets you run x86 Linux programs on non-x86 Linux systems";
+    changelog = "https://github.com/ptitSeb/box86/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      gador
+      OPNA2608
+    ];
+    mainProgram = "box86";
+    platforms = [
+      "i686-linux"
+      "armv7l-linux"
+      "powerpcle-linux"
+      "loongarch64-linux"
+      "mipsel-linux"
+    ];
+  };
+})
diff --git a/pkgs/applications/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix
index de98278b83251..a7519eb49ecf1 100644
--- a/pkgs/applications/emulators/hatari/default.nix
+++ b/pkgs/applications/emulators/hatari/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Atari ST/STE/TT/Falcon emulator";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix
index 57748a04dada7..061717d5c6560 100644
--- a/pkgs/applications/emulators/simplenes/default.nix
+++ b/pkgs/applications/emulators/simplenes/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/amhndu/SimpleNES";
     description = "NES emulator written in C++";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "SimpleNES";
   };
diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix
index 7b5c4340edd66..0b09d6ea9ed58 100644
--- a/pkgs/applications/file-managers/xfe/default.nix
+++ b/pkgs/applications/file-managers/xfe/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://sourceforge.net/projects/xfe/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index 722363a9b0706..dac185e3d3d07 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Software suite to create, edit, compose, or convert bitmap images";
     pkgConfigModules = [ "ImageMagick" "MagickWand" ];
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
     knownVulnerabilities = [
       "CVE-2019-13136"
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 38c38143ff9ff..cf823398a446f 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     mainProgram = "gcolor3";
     homepage = "https://gitlab.gnome.org/World/gcolor3";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 0a63d82b1b2d3..667a1d505751a 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -102,7 +102,7 @@ in
       description = "Batch Image Manipulation Plugin for GIMP";
       homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp";
       license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 89b86bf24b206..b3556cf27846c 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gqview.sourceforge.net";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gqview";
   };
 }
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 3758c091a831b..c7cbf22e013eb 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
     description = "Graphviz dot graph viewer for KDE";
     mainProgram = "kgraphviewer";
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix
index 7fcfebe11d722..308538f5d691d 100644
--- a/pkgs/applications/graphics/lazpaint/default.nix
+++ b/pkgs/applications/graphics/lazpaint/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
     downloadPage = "https://github.com/bgrabitmap/lazpaint/";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lazpaint";
   };
 }
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 494815ac930b0..8b952ab79d840 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -101,6 +101,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     homepage = "https://www.damonlynch.net/rapid/";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index b83b9df83b018..b85e0bdc6042d 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -21,7 +21,7 @@ mkDerivation rec {
     description = "Interactive post-processing tool for scanned pages (vigri's fork)";
     mainProgram = "scantailor";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; gnu ++ linux ++ darwin;
   };
 }
diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix
index 592244455e981..db2dd60214a2a 100644
--- a/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/pkgs/applications/graphics/smartdeblur/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Tool for restoring blurry and defocused images";
     mainProgram = "SmartDeblur";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix
index ba4df38ab059e..6ab953020c607 100644
--- a/pkgs/applications/graphics/tev/default.nix
+++ b/pkgs/applications/graphics/tev/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     platforms = platforms.unix;
     broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix
index cd6f5ff850345..01501e9757efd 100644
--- a/pkgs/applications/graphics/xpano/default.nix
+++ b/pkgs/applications/graphics/xpano/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xpano";
-  version = "0.18.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "krupkat";
     repo = pname;
     rev = "v${version}";
-    sha256 = "iPGvCJz2iywpSePBZ3c8OiccKfwaGAToGaJfRhruUPk=";
+    sha256 = "sha256-cb6BJg0wdfhqEFLbQ27NpjJU/cc4SZSk94UHzJfzn5U=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index d3cead3671694..e0fa8cc64da49 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -23,6 +23,6 @@ mkDerivation rec {
     homepage = "http://www.yacreader.com";
     license = lib.licenses.gpl3;
     mainProgram = "YACReader";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/alligator.nix b/pkgs/applications/kde/alligator.nix
index 78263cb73be57..cf178e3fe4a7b 100644
--- a/pkgs/applications/kde/alligator.nix
+++ b/pkgs/applications/kde/alligator.nix
@@ -38,6 +38,6 @@ mkDerivation rec {
     # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a
     #  * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
     license = with licenses; [ gpl2Only gpl3Only ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix
index 58d188d486fbb..2f9937f106b61 100644
--- a/pkgs/applications/kde/audiotube.nix
+++ b/pkgs/applications/kde/audiotube.nix
@@ -66,6 +66,6 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/plasma-mobile/audiotube";
     # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES
     license = with licenses; [ bsd2 cc0 gpl2Only gpl3Only ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/calindori.nix b/pkgs/applications/kde/calindori.nix
index c1e9f4d59b18b..d7d508f55bcd0 100644
--- a/pkgs/applications/kde/calindori.nix
+++ b/pkgs/applications/kde/calindori.nix
@@ -41,6 +41,6 @@ mkDerivation rec {
     description = "Calendar for Plasma Mobile";
     homepage = "https://invent.kde.org/plasma-mobile/calindori";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/kalk.nix b/pkgs/applications/kde/kalk.nix
index d88741d179bb7..dd4be365d7be3 100644
--- a/pkgs/applications/kde/kalk.nix
+++ b/pkgs/applications/kde/kalk.nix
@@ -46,6 +46,6 @@ mkDerivation rec {
     mainProgram = "kalk";
     homepage = "https://invent.kde.org/plasma-mobile/kalk";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix
index 87136676df40b..00e87c05a4866 100644
--- a/pkgs/applications/kde/kasts.nix
+++ b/pkgs/applications/kde/kasts.nix
@@ -63,6 +63,6 @@ mkDerivation rec {
     homepage = "https://apps.kde.org/kasts/";
     # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES
     license = with licenses; [ bsd2 cc-by-sa-40 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/kclock.nix b/pkgs/applications/kde/kclock.nix
index d97ad54177448..678c5ad6285e5 100644
--- a/pkgs/applications/kde/kclock.nix
+++ b/pkgs/applications/kde/kclock.nix
@@ -41,6 +41,6 @@ mkDerivation rec {
     description = "Clock app for plasma mobile";
     homepage = "https://invent.kde.org/plasma-mobile/kclock";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix
index 1c2e46c211242..6b089aa156acd 100644
--- a/pkgs/applications/kde/kmahjongg.nix
+++ b/pkgs/applications/kde/kmahjongg.nix
@@ -17,6 +17,6 @@ mkDerivation {
     mainProgram = "kmahjongg";
     homepage = "https://apps.kde.org/kmahjongg/";
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix
index d47734b94e1f9..4ea96c995bd20 100644
--- a/pkgs/applications/kde/koko.nix
+++ b/pkgs/applications/kde/koko.nix
@@ -77,6 +77,6 @@ mkDerivation rec {
     homepage = "https://apps.kde.org/koko/";
     # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
     license = [ licenses.lgpl3Only licenses.lgpl21Only ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix
index 41ca056f8a96b..ca5be592af141 100644
--- a/pkgs/applications/kde/konquest.nix
+++ b/pkgs/applications/kde/konquest.nix
@@ -26,6 +26,6 @@ mkDerivation {
     description = "Galactic strategy game";
     mainProgram = "konquest";
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/krecorder.nix b/pkgs/applications/kde/krecorder.nix
index d6bdfcc4d38cb..78c8e9ebb7fdb 100644
--- a/pkgs/applications/kde/krecorder.nix
+++ b/pkgs/applications/kde/krecorder.nix
@@ -38,6 +38,6 @@ mkDerivation rec {
     mainProgram = "krecorder";
     homepage = "https://invent.kde.org/plasma-mobile/krecorder";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix
index 64567ad9d88f4..8771c878323f7 100644
--- a/pkgs/applications/kde/ksudoku.nix
+++ b/pkgs/applications/kde/ksudoku.nix
@@ -16,6 +16,6 @@ mkDerivation {
     description = "Suduko game";
     mainProgram = "ksudoku";
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/ktrip.nix b/pkgs/applications/kde/ktrip.nix
index 8780a64d51a98..fd30379465d53 100644
--- a/pkgs/applications/kde/ktrip.nix
+++ b/pkgs/applications/kde/ktrip.nix
@@ -43,6 +43,6 @@ mkDerivation rec {
     homepage = "https://apps.kde.org/ktrip/";
     # GPL-2.0-or-later
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/kweather.nix b/pkgs/applications/kde/kweather.nix
index 5c2f244fae60e..6e2d3047d0251 100644
--- a/pkgs/applications/kde/kweather.nix
+++ b/pkgs/applications/kde/kweather.nix
@@ -44,6 +44,6 @@ mkDerivation rec {
     mainProgram = "kweather";
     homepage = "https://invent.kde.org/plasma-mobile/kweather";
     license = with licenses; [ gpl2Plus cc-by-40 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix
index ec53fa9b0507d..89d9626363ea4 100644
--- a/pkgs/applications/kde/libkdegames.nix
+++ b/pkgs/applications/kde/libkdegames.nix
@@ -20,6 +20,6 @@ mkDerivation {
   ];
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix
index 6fe8c55004c2d..1b202b614880e 100644
--- a/pkgs/applications/kde/libkmahjongg.nix
+++ b/pkgs/applications/kde/libkmahjongg.nix
@@ -9,7 +9,7 @@ mkDerivation {
   pname = "libkmahjongg";
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n
diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix
index 53c071dcc4cb1..6a5e3f8781fa3 100644
--- a/pkgs/applications/logging/sosreport/default.nix
+++ b/pkgs/applications/logging/sosreport/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Unified tool for collecting system logs and other debug information";
     homepage = "https://github.com/sosreport/sos";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index f469ef5f0fed8..a76b30492ab18 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "https://soxr.sourceforge.net";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index d74f67b6cc2ba..69b457a4f0703 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.giuspen.com/cherrytree";
     changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/applications/misc/colorstorm/default.nix
index 63014eb51e60f..da612b33c2baf 100644
--- a/pkgs/applications/misc/colorstorm/default.nix
+++ b/pkgs/applications/misc/colorstorm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Color theme generator for editors and terminal emulators";
     homepage = "https://github.com/benbusby/colorstorm";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (zig_0_9.meta) platforms;
     mainProgram = "colorstorm";
   };
diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix
index 5431dab2cf4e3..e1ea239b43fc4 100644
--- a/pkgs/applications/misc/cum/default.nix
+++ b/pkgs/applications/misc/cum/default.nix
@@ -31,7 +31,7 @@ buildPythonApplication rec {
     mainProgram = "cum";
     homepage = "https://github.com/Hamuko/cum";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/dict-cc-py/default.nix b/pkgs/applications/misc/dict-cc-py/default.nix
index 9d4c40084f7f0..6742d020cd98c 100644
--- a/pkgs/applications/misc/dict-cc-py/default.nix
+++ b/pkgs/applications/misc/dict-cc-py/default.nix
@@ -28,6 +28,6 @@ python3.pkgs.buildPythonPackage rec {
     mainProgram = "dict.cc.py";
     homepage = "https://github.com/rbaron/dict.cc.py";
     license = with licenses; [ cc0 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index 4792003b792e7..98f85807806d9 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -53,7 +53,7 @@ mkDerivation rec {
     description = "Tool for diffing pdf files visually or textually";
     mainProgram = "diffpdf";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix
index c21b071819029..27fd0ce892f7e 100644
--- a/pkgs/applications/misc/ff2mpv/default.nix
+++ b/pkgs/applications/misc/ff2mpv/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Native Messaging Host for ff2mpv firefox addon";
     homepage = "https://github.com/woodruffw/ff2mpv";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ff2mpv.py";
   };
 }
diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix
index d9f7bd91ab2ec..4ced9fc7b00dd 100644
--- a/pkgs/applications/misc/filet/default.nix
+++ b/pkgs/applications/misc/filet/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/buffet/filet";
     license = licenses.mpl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "filet";
   };
 }
diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix
index 6b0eaeff65f5e..1ce8d1cb4e178 100644
--- a/pkgs/applications/misc/gopacked/default.nix
+++ b/pkgs/applications/misc/gopacked/default.nix
@@ -19,6 +19,6 @@ buildGoModule rec {
     description = "Simple text-based Minecraft modpack manager";
     license = licenses.agpl3Plus;
     homepage = src.meta.homepage;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix
index e7e654321ece0..a2ba9a1bfd0f7 100644
--- a/pkgs/applications/misc/harsh/default.nix
+++ b/pkgs/applications/misc/harsh/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
     homepage = "https://github.com/wakatara/harsh";
     changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "harsh";
   };
 }
diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix
index e8d90c9e16974..d5b20e6646ff4 100644
--- a/pkgs/applications/misc/hcl2json/default.nix
+++ b/pkgs/applications/misc/hcl2json/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     description = "Convert hcl2 to json";
     homepage = "https://github.com/tmccombs/hcl2json";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "hcl2json";
   };
 }
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 7f9b1ae96bbba..ada6d8cdc6b8a 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
     homepage = "https://github.com/juzzlin/Heimer";
     changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG";
     license = licenses.gpl3Plus;
-    maintainers  = with maintainers; [ ];
+    maintainers  = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 8eaf05298e892..263acefe7cb6d 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -51,7 +51,7 @@ in bundlerApp {
     homepage    = "https://jekyllrb.com/";
     #changelog   = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";
     license     = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.unix;
     mainProgram = "jekyll";
   };
diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/applications/misc/junction/default.nix
index 66658cfe7402e..cf03a315b2cfa 100644
--- a/pkgs/applications/misc/junction/default.nix
+++ b/pkgs/applications/misc/junction/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "junction";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "junction";
     rev = "v${version}";
-    hash = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI=";
+    hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY=";
     fetchSubmodules = true;
   };
 
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     mainProgram = "re.sonny.Junction";
     description = "Choose the application to open files and links";
-    homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/";
+    homepage = "https://apps.gnome.org/Junction/";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ hqurve ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix
index 0ae96fcf6115d..bbccddbadbad3 100644
--- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix
+++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix
@@ -41,7 +41,7 @@ buildGoModule rec {
     '';
     license = licenses.mit;
     homepage = "https://github.com/mschneider82/keylight-control";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "keylight-control";
   };
 }
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 1c338a7f58a61..3b9d4f83f5743 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -43,6 +43,6 @@ mkDerivation {
     homepage = "https://kiwix.org";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix
index eba5799a91727..03fc56ceb016e 100644
--- a/pkgs/applications/misc/kondo/default.nix
+++ b/pkgs/applications/misc/kondo/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "kondo";
@@ -13,6 +13,15 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg=";
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd kondo \
+      --bash <($out/bin/kondo --completions bash) \
+      --fish <($out/bin/kondo --completions fish) \
+      --zsh <($out/bin/kondo --completions zsh)
+  '';
+
   meta = with lib; {
     description = "Save disk space by cleaning unneeded files from software projects";
     homepage = "https://github.com/tbillington/kondo";
diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/applications/misc/lemonade/default.nix
index c9ca92d364e13..012020c1768e5 100644
--- a/pkgs/applications/misc/lemonade/default.nix
+++ b/pkgs/applications/misc/lemonade/default.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
     description = "Remote utility tool that to copy, paste and open browsers over TCP";
     homepage = "https://github.com/lemonade-command/lemonade/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lemonade";
   };
 }
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 2623b9f027ccc..34612e6dd3a3b 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -37,6 +37,6 @@ python3.pkgs.buildPythonApplication {
     homepage = "https://www.christoph-sommer.de/loxodo/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index dc79cc5922fb9..bf3c3b06dc836 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,34 +1,48 @@
-{ fetchurl, lib, mkDerivation, pkg-config, python3, file, bc
-, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
+{
+  fetchurl,
+  lib,
+  mkDerivation,
+  pkg-config,
+  python3,
+  file,
+  bc,
+  qtbase,
+  qtsvg,
+  hunspell,
+  makeWrapper, # , mythes, boost
 }:
 
 mkDerivation rec {
-  version = "2.3.7-1";
+  version = "2.4.1";
   pname = "lyx";
 
   src = fetchurl {
-    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Ob6IZPuGs06IMQ5w+4Dl6eKWYB8IVs8WGqCUFxcY2O0=";
+    url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz";
+    hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U=";
   };
 
-  # Needed with GCC 12
-  postPatch = ''
-    sed '1i#include <iterator>' -i src/lyxfind.cpp
-    sed '1i#include <cstring>'  -i src/insets/InsetListings.cpp
-  '';
-
   # LaTeX is used from $PATH, as people often want to have it with extra pkgs
-  nativeBuildInputs = [ pkg-config makeWrapper python3 qtbase ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+    python3
+    qtbase
+  ];
   buildInputs = [
-    qtbase qtsvg file/*for libmagic*/ bc
+    qtbase
+    qtsvg
+    file # for libmagic
+    bc
     hunspell # enchant
   ];
 
   configureFlags = [
     "--enable-qt5"
     #"--without-included-boost"
-    /*  Boost is a huge dependency from which 1.4 MB of libs would be used.
-        Using internal boost stuff only increases executable by around 0.2 MB. */
+    /*
+      Boost is a huge dependency from which 1.4 MB of libs would be used.
+       Using internal boost stuff only increases executable by around 0.2 MB.
+    */
     #"--without-included-mythes" # such a small library isn't worth a separate package
   ];
 
@@ -36,9 +50,7 @@ mkDerivation rec {
   doCheck = true;
 
   # python is run during runtime to do various tasks
-  qtWrapperArgs = [
-    " --prefix PATH : ${python3}/bin"
-  ];
+  qtWrapperArgs = [ " --prefix PATH : ${python3}/bin" ];
 
   meta = with lib; {
     description = "WYSIWYM frontend for LaTeX, DocBook";
@@ -48,4 +60,3 @@ mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index 203d71a6cc48f..775bff23c15a8 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     description = "CLI for the Mastodon social network API";
     homepage = "https://github.com/McKael/madonctl";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "madonctl";
   };
 }
diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix
index f730e9265d257..3407af8df3d76 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/applications/misc/maliit-framework/default.nix
@@ -73,6 +73,6 @@ mkDerivation rec {
     mainProgram = "maliit-server";
     homepage = "http://maliit.github.io/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix
index c315b5251cea0..108137188b226 100644
--- a/pkgs/applications/misc/maliit-keyboard/default.nix
+++ b/pkgs/applications/misc/maliit-keyboard/default.nix
@@ -69,6 +69,6 @@ mkDerivation rec {
     mainProgram = "maliit-keyboard";
     homepage = "http://maliit.github.io/";
     license = with licenses; [ lgpl3Only bsd3 cc-by-30 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix
index 6ddef51e3e6d8..d98ecb21daafb 100644
--- a/pkgs/applications/misc/minigalaxy/default.nix
+++ b/pkgs/applications/misc/minigalaxy/default.nix
@@ -76,7 +76,7 @@ python3Packages.buildPythonApplication rec {
     downloadPage = "https://github.com/sharkwouter/minigalaxy/releases";
     description = "Simple GOG client for Linux";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix
index a19297acbc856..4c7bd07f6eeb3 100644
--- a/pkgs/applications/misc/mozphab/default.nix
+++ b/pkgs/applications/misc/mozphab/default.nix
@@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html";
     license = licenses.mpl20;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix
index 4dde27827c965..cccb55f5e5f72 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -40,6 +40,6 @@ appimageTools.wrapType2 rec {
     homepage = "https://github.com/notable/notable";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix
index d3e11493fad80..4e2447379bdda 100644
--- a/pkgs/applications/misc/nwg-launchers/default.nix
+++ b/pkgs/applications/misc/nwg-launchers/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/nwg-piotr/nwg-launchers";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index 2d28d8138c289..8d4d4df4ef755 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     broken = stdenv.isDarwin;
     description = "Framework for controlling entertainment lighting equipment";
     homepage = "https://www.openlighting.org/ola/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = with licenses; [ lgpl21 gpl2Plus ];
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix
index 7ac9f639858de..5c158d7ab7679 100644
--- a/pkgs/applications/misc/openrgb/default.nix
+++ b/pkgs/applications/misc/openrgb/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Open source RGB lighting control";
     homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     mainProgram = "openrgb";
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 5943050c00c23..4546883b2bb33 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -120,7 +120,7 @@ rec {
       homepage = "http://jonls.dk/redshift";
       platforms = platforms.unix;
       mainProgram = "redshift";
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 615fa2c10faeb..41988c2829578 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -49,7 +49,7 @@ in mkDerivation rec {
   meta = with lib; {
     description = "Helps you understand your daily habits so you can focus and be more productive";
     homepage    = "https://www.rescuetime.com";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license     = licenses.unfree;
     platforms   = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix
index 902eef4cb1cdf..18e7a1c722417 100644
--- a/pkgs/applications/misc/resp-app/default.nix
+++ b/pkgs/applications/misc/resp-app/default.nix
@@ -99,6 +99,6 @@ mkDerivation rec {
     homepage = "https://resp.app/";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix
index 569ae6ef4cd88..7d5cb9f3eb89e 100644
--- a/pkgs/applications/misc/rofi-menugen/default.nix
+++ b/pkgs/applications/misc/rofi-menugen/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Generates menu based applications using rofi";
     homepage = "https://github.com/octotep/menugen";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix
index 4c11333a4a01b..47ff2d588b718 100644
--- a/pkgs/applications/misc/scli/default.nix
+++ b/pkgs/applications/misc/scli/default.nix
@@ -54,6 +54,6 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "scli";
     homepage = "https://github.com/isamert/scli";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix
index 2aeedcc25b2b6..4825b00c89596 100644
--- a/pkgs/applications/misc/siglo/default.nix
+++ b/pkgs/applications/misc/siglo/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/theironrobin/siglo";
     changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/applications/misc/spotify-tray/default.nix
index 04e1b5d2ea266..7eb84702be0cd 100644
--- a/pkgs/applications/misc/spotify-tray/default.nix
+++ b/pkgs/applications/misc/spotify-tray/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "Adds a tray icon to the Spotify Linux client application";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "spotify-tray";
   };
 }
diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix
index 77f3954ed0597..6c82c6efe96e3 100644
--- a/pkgs/applications/misc/surface-control/default.nix
+++ b/pkgs/applications/misc/surface-control/default.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
       "Control various aspects of Microsoft Surface devices on Linux from the Command-Line";
     homepage = "https://github.com/linux-surface/surface-control";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "surface";
   };
diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix
index ee39266d99581..cbcb5d90261f1 100644
--- a/pkgs/applications/misc/swaynag-battery/default.nix
+++ b/pkgs/applications/misc/swaynag-battery/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://github.com/m00qek/swaynag-battery";
     description = "Shows a message when your battery is discharging";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
     mainProgram = "swaynag-battery";
   };
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix
index 5f43956d8ae6b..bc9966ab2b769 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/pkgs/applications/misc/tdrop/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/noctuid/tdrop";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 19370fae01333..e2bd8dd2f9c56 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://github.com/julienXX/terminal-notifier";
     license = licenses.mit;
     platforms  = platforms.darwin;
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
index 39a3c7013b0a1..92411687ac9c8 100644
--- a/pkgs/applications/misc/topydo/default.nix
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -48,6 +48,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/topydo/topydo";
     changelog = "https://github.com/topydo/topydo/blob/${src.rev}/CHANGES.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index 90d1cc01ffb46..763cd75ffdbfa 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     description = "Tool for managing the TPM";
     mainProgram = "tpmmanager";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/applications/misc/udict/default.nix
index 62d698cc3a360..24424c1017db7 100644
--- a/pkgs/applications/misc/udict/default.nix
+++ b/pkgs/applications/misc/udict/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     description = "Urban Dictionary CLI - written in Rust";
     homepage = "https://github.com/lsmb/udict";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "udict";
   };
 }
diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix
index 525a3a5399df1..18109f96917ec 100644
--- a/pkgs/applications/misc/valentina/default.nix
+++ b/pkgs/applications/misc/valentina/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index c6ad0199e51fb..4809462740cc6 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Launcher/menu program for wlroots based wayland compositors such as sway";
     homepage = "https://hg.sr.ht/~scoopta/wofi";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
     mainProgram = "wofi";
   };
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index fc63ef02bc392..52a7b95bb8039 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -12,13 +12,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "xdgmenumaker";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "gapan";
     repo = pname;
     rev = version;
-    sha256 = "zFqaNKHJiGP8MoNFUZL13/F1oRx2LBvtFMvLAy+cLJQ=";
+    sha256 = "uSSKiceHurk+qGVnaYa4uJEuq9FQROdhcotQxPBgPIs=";
   };
 
   format = "other";
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index c7b3c3e52c940..00d3563d5b769 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index b7eff35913c3b..b3b5d514a84c9 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 1c4ba79ee91b7..7119acd037464 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 63b9cedd7a299..54202f919669d 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index 67edb1657a83b..130fca5f2a9e3 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -38,7 +38,7 @@
     # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each
     # update, rely on `floorp` being in $PATH, as before.
     substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \
-      --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' floorp
+      --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"'
   '';
 
   updateScript = ./update.sh;
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index bb84c0014755b..5099dd93c3c4a 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,15 +1,15 @@
 {
-  "packageVersion": "128.0-2",
+  "packageVersion": "128.0.3-1",
   "source": {
-    "rev": "128.0-2",
-    "sha256": "0239m5r5nfn291slpxh1qhj3g3q2pskyp967ahvn7nbsqlvjyhag"
+    "rev": "128.0.3-1",
+    "sha256": "0pp36q4rcsiyv9b09jfgfrl1k3vqp5bh08c9iq0r2v8is5rbcdz5"
   },
   "settings": {
     "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae",
     "sha256": "12xgjv40mihbyfsah26vvdyb4yirydc1a884v2chnca4f5q00lc2"
   },
   "firefox": {
-    "version": "128.0",
-    "sha512": "309c0e2a0bea5699e6daf4fa02300ad7fd118d2c02c35cb5fa97a5fcc6e250cc7aec34e50fe872b8fd516436bfcfe37ddf33c9d0f9291860388cd6f3f08ea9f1"
+    "version": "128.0.3",
+    "sha512": "52a0a1a6fa653f5a621a9e16e1937760c05a5ebc81a058ecc16b2c3d29d09d418dc5129deabed86ad2f82abdb3100969478a67f48b11616dc3b3e3698a1acf51"
   }
 }
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 88eb19146e8f8..1cad8d577710d 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "Text-mode web browser";
     homepage = "https://lynx.invisible-island.net/";
     mainProgram = "lynx";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix
index 03d181325ac79..ab481ba74cb3e 100644
--- a/pkgs/applications/networking/cluster/atmos/default.nix
+++ b/pkgs/applications/networking/cluster/atmos/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "atmos";
-  version = "1.83.1";
+  version = "1.85.0";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-B1s+9oLShbrziYm9P8xE5UPwxTchlGPUmjYSWGhsGjY=";
+    sha256 = "sha256-nIW7Wt4mThxjnHHF+rD6q9vZ7KsB//nSpkWtkiTo16Y=";
   };
 
-  vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E=";
+  vendorHash = "sha256-swQN0WjVfLo/LjZrvjX46CnfBGnrVzLj8Cv4IP0eL7Y=";
 
   ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
 
diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix
index 0c676bed1c0b8..9892010ef7b0b 100644
--- a/pkgs/applications/networking/cluster/civo/default.nix
+++ b/pkgs/applications/networking/cluster/civo/default.nix
@@ -42,6 +42,6 @@ buildGoModule rec {
     mainProgram = "civo";
     homepage = "https://github.com/civo/cli";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index 3cc2673508725..7710490816e7e 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cni";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yM4opOrHH0NQz26yHuzQfiXdWc8LbxAaqxXQDFdUb60=";
+    hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE=";
   };
 
   vendorHash = "sha256-/aPx8NgGkJ1irU0LGzmYTlsiX2U5or24Vl1PGHWuDyE=";
diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix
index 6f74be61c4078..a695f261ef62f 100644
--- a/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     mainProgram = "glooctl";
     homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix
index 37c0bb3b74ae5..4736141606186 100644
--- a/pkgs/applications/networking/cluster/kubeshark/default.nix
+++ b/pkgs/applications/networking/cluster/kubeshark/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kubeshark";
-  version = "52.3.69";
+  version = "52.3.72";
 
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
     rev = "v${version}";
-    hash = "sha256-ZjpuzR+psdZAH7t9uV4jXN6Im1u+JDCDARAxAuBN4nk=";
+    hash = "sha256-2c86/VeByTLBG3pwLfSiUw7V3WJZuwnVopLmM8njbkQ=";
   };
 
-  vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4=";
+  vendorHash = "sha256-b3Aq3970E19jOJPjw/e0ly1W9x9HiDN+bfuB4uP09BY=";
 
   ldflags = let t = "github.com/kubeshark/kubeshark"; in [
    "-s" "-w"
diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
index 8a0d2d4c49338..a78d4d2cfd997 100644
--- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
+++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
@@ -48,6 +48,6 @@ buildPythonPackage {
     description = "NixOps Digitalocean plugin";
     homepage = "https://github.com/nix-community/nixops-digitalocean";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix
index 817da055d6342..8b890157a2221 100644
--- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix
+++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix
@@ -40,6 +40,6 @@ buildPythonPackage {
     description = "EncryptedLinksTo from Nixops 1 module port";
     homepage = "https://github.com/nix-community/nixops-encrypted-links";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
index 5199400cae9eb..6a232472f6cd5 100644
--- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
+++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
@@ -94,7 +94,7 @@ let
       mainProgram = "nomad-autoscaler";
       homepage = "https://github.com/hashicorp/nomad-autoscaler";
       license = licenses.mpl20;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix
index 2b61a146d916d..d278663f7269e 100644
--- a/pkgs/applications/networking/cluster/opentofu/default.nix
+++ b/pkgs/applications/networking/cluster/opentofu/default.nix
@@ -14,16 +14,16 @@
 let
   package =  buildGoModule rec {
     pname = "opentofu";
-    version = "1.7.3";
+    version = "1.8.0";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       rev = "v${version}";
-      hash = "sha256-xP2TvL9n1mFfk5krtOTKGL6i4e+/xGLkBsMwZXiQTok=";
+      hash = "sha256-c12CkfJyA5NjsOm/85QS41RfpBRW4pDX/vH6lk+d+9M=";
     };
 
-    vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q=";
+    vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";
     ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ];
 
     postConfigure = ''
diff --git a/pkgs/applications/networking/cluster/rke2/update-script.sh b/pkgs/applications/networking/cluster/rke2/update-script.sh
index 608f49bb64903..029933b8f8028 100755
--- a/pkgs/applications/networking/cluster/rke2/update-script.sh
+++ b/pkgs/applications/networking/cluster/rke2/update-script.sh
@@ -5,7 +5,9 @@ set -x -eu -o pipefail
 
 CHANNEL_NAME="${1:?Must provide a release channel, like 'stable', as the only argument}"
 
-mkdir --parents --verbose ./${CHANNEL_NAME}
+WORKDIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd -P)
+
+mkdir --parents --verbose "${WORKDIR}/${CHANNEL_NAME}"
 
 LATEST_TAG_NAME=$(curl --silent --fail https://update.rke2.io/v1-release/channels | \
     yq eval ".data[] | select(.id == \"${CHANNEL_NAME}\").latest" - | \
@@ -35,9 +37,9 @@ KUBERNETES_EOL=$(curl --silent --fail \
         https://endoflife.date/api/kubernetes/${KUBERNETES_CYCLES}.json | \
     yq eval ".eol" -)
 
-FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
 
-cat > ./${CHANNEL_NAME}/versions.nix << EOF
+cat << EOF > "${WORKDIR}/${CHANNEL_NAME}/versions.nix"
 {
   rke2Version = "${RKE2_VERSION}";
   rke2RepoSha256 = "${RKE2_REPO_SHA256}";
@@ -54,15 +56,13 @@ cat > ./${CHANNEL_NAME}/versions.nix << EOF
 }
 EOF
 
-NIXPKGS_ROOT=$(git rev-parse --show-toplevel)
-
 set +e
-RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} \
-        "{ sha256 }: (import ${NIXPKGS_ROOT}/. {}).rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
+RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=$(git rev-parse --show-toplevel) \
+        "{ sha256 }: rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
 set -e
 
 if [ -n "${RKE2_VENDOR_HASH:-}" ]; then
-    sed -i "s#${FAKE_HASH}#${RKE2_VENDOR_HASH}#g" ./${CHANNEL_NAME}/versions.nix
+    sed -i "s#${FAKE_HASH}#${RKE2_VENDOR_HASH}#g" ${WORKDIR}/${CHANNEL_NAME}/versions.nix
 else
     echo "Update failed. 'RKE2_VENDOR_HASH' is empty."
     exit 1
@@ -70,17 +70,15 @@ fi
 
 # Implement commit
 # See: https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
-OLD_VERSION=$(nix-instantiate --eval -E \
-        "with import ${NIXPKGS_ROOT}/. {}; rke2.version or (builtins.parseDrvName rke2.name).version" | \
-    tr -d '"')
-
 cat << EOF
-[{
-  "attrPath": "rke2_${CHANNEL_NAME}",
-  "oldVersion": "${OLD_VERSION}",
-  "newVersion": "${RKE2_VERSION}",
-  "files": [
-    "${PWD}/${CHANNEL_NAME}/versions.nix"
-  ]
-}]
+[
+  {
+    "attrPath": "rke2_${CHANNEL_NAME}",
+    "oldVersion": "${UPDATE_NIX_OLD_VERSION}",
+    "newVersion": "${RKE2_VERSION}",
+    "files": [
+      "${WORKDIR}/${CHANNEL_NAME}/versions.nix"
+    ]
+  }
+]
 EOF
diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix
index 3b23b750864cf..1b81c59e713b4 100644
--- a/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/pkgs/applications/networking/cluster/temporal/default.nix
@@ -45,7 +45,7 @@ buildGoModule rec {
     homepage = "https://temporal.io";
     changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "temporal-server";
   };
 }
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 167e52e2a7f2c..02865985be101 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -179,6 +179,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso="
   },
+  "bitwarden": {
+    "hash": "sha256-+zuKZBwoOSp3HIdxmK1FInE33/1D5nX2N7zYBCtRvHA=",
+    "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
+    "owner": "maxlaverse",
+    "repo": "terraform-provider-bitwarden",
+    "rev": "v0.8.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-u9ICJtPZveRrK5BOthvFDGkNcUiA0/Hb39KM0eIhUVI="
+  },
   "brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
     "homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/applications/networking/cluster/terraspace/Gemfile
index 7a6bbf7cc943e..3e9579dd75cf3 100644
--- a/pkgs/applications/networking/cluster/terraspace/Gemfile
+++ b/pkgs/applications/networking/cluster/terraspace/Gemfile
@@ -1,2 +1,2 @@
 source "https://rubygems.org"
-gem "terraspace", '~> 2.2.8'
+gem "terraspace"
diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
index 4fce1f819664d..aa9e1600198be 100644
--- a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
@@ -1,36 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.785.0)
-    aws-sdk-core (3.177.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.956.0)
+    aws-sdk-core (3.201.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.70.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.128.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    cli-format (0.2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    cli-format (0.6.1)
       activesupport
       text-table
       zeitwerk
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     deep_merge (1.2.2)
-    diff-lcs (1.5.0)
-    dotenv (2.8.1)
-    dsl_evaluator (0.3.1)
+    diff-lcs (1.5.1)
+    dotenv (3.1.2)
+    drb (2.2.1)
+    dsl_evaluator (0.3.2)
       activesupport
       memoist
       rainbow
@@ -38,40 +47,42 @@ GEM
     eventmachine (1.2.7)
     eventmachine-tail (0.6.5)
       eventmachine
-    graph (2.11.0)
+    graph (2.11.1)
     hcl_parser (0.2.2)
       rhcl
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     memoist (0.16.2)
-    minitest (5.18.1)
-    nokogiri (1.15.3)
-      racc (~> 1.4)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
-    racc (1.7.1)
-    mini_portile2 (2.8.2)
+      racc (~> 1.4)
+    racc (1.8.0)
     rainbow (3.1.1)
     render_me_pretty (0.9.0)
       activesupport
       rainbow
       tilt
-    rexml (3.2.5)
+    rexml (3.3.2)
+      strscan
     rhcl (0.1.0)
       deep_merge
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rspec-terraspace (0.3.3)
       activesupport
       memoist
@@ -79,7 +90,8 @@ GEM
       rspec
       zeitwerk
     rubyzip (2.3.2)
-    terraspace (2.2.8)
+    strscan (3.1.0)
+    terraspace (2.2.17)
       activesupport
       bundler
       cli-format
@@ -110,20 +122,20 @@ GEM
       thor
       zeitwerk
     text-table (1.2.4)
-    thor (1.2.2)
-    tilt (2.2.0)
+    thor (1.3.1)
+    tilt (2.4.0)
     tty-tree (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.16)
     zip_folder (0.1.0)
       rubyzip
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
-  terraspace (~> 2.2.8)
+  terraspace
 
 BUNDLED WITH
-   2.3.26
+   2.5.11
diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/applications/networking/cluster/terraspace/gemset.nix
index a4e082c6d0d85..606e450c42708 100644
--- a/pkgs/applications/networking/cluster/terraspace/gemset.nix
+++ b/pkgs/applications/networking/cluster/terraspace/gemset.nix
@@ -1,34 +1,34 @@
 {
   activesupport = {
-    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk";
+      sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
       type = "gem";
     };
-    version = "7.0.6";
+    version = "7.1.3.4";
   };
   aws-eventstream = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   aws-partitions = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05m0c3h1z0jhaqiciil55fshrjvc725cf1lc0g933pf98vqflb0r";
+      sha256 = "03zb6x4x68y91gywsyi4a6hxy4pdyng8mnxwd858bhjfymml8kkf";
       type = "gem";
     };
-    version = "1.785.0";
+    version = "1.956.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09firi4bin3ay4pd59qgxspq2f1isfi1li8rabpw6lvvbhnar168";
+      sha256 = "1ihl7iwndl3jjy89sh427wf8mdb7ii76bsjf6fkxq9ha30nz4f3g";
       type = "gem";
     };
-    version = "3.177.0";
+    version = "3.201.1";
   };
   aws-sdk-kms = {
     dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -47,10 +47,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x73qj2c39ap926by14x56cjmp2cd5jpq5gv33xynypy1idyb0fj";
+      sha256 = "02g3l3lcyddqncrwjxgawxl33p2p715k1gbrdlgyiv0yvy88sn0k";
       type = "gem";
     };
-    version = "1.70.0";
+    version = "1.88.0";
   };
   aws-sdk-s3 = {
     dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -58,10 +58,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11cxk6b3p1bsl1gg3pi93qx2ynbjrrsrsc68nnqsjm4npvaj052v";
+      sha256 = "0ika0xmmrkc7jiwdi5gqia5wywkcbw1nal2dhl436dkh38fxl0lk";
       type = "gem";
     };
-    version = "1.128.0";
+    version = "1.156.0";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -69,10 +69,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na";
+      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.8.0";
+  };
+  base64 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  bigdecimal = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
+      type = "gem";
+    };
+    version = "3.1.8";
   };
   cli-format = {
     dependencies = ["activesupport" "text-table" "zeitwerk"];
@@ -80,20 +100,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf";
+      sha256 = "0rrjck5r25dlcg1gwz6pb5f4rllx77lg6a514a5l3lajfd95shm3";
       type = "gem";
     };
-    version = "0.2.2";
+    version = "0.6.1";
   };
   concurrent-ruby = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+      sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.3.3";
+  };
+  connection_pool = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
+      type = "gem";
+    };
+    version = "2.4.1";
   };
   deep_merge = {
     groups = ["default"];
@@ -110,20 +140,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
+      sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.5.1";
   };
   dotenv = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565";
+      sha256 = "0y24jabiz4cf9ni9vi4j8sab8b5phpf2mpw3981r0r94l4m6q0q8";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "3.1.2";
+  };
+  drb = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
+      type = "gem";
+    };
+    version = "2.2.1";
   };
   dsl_evaluator = {
     dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"];
@@ -131,10 +171,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51";
+      sha256 = "0hd079baa5pfyyc2wc9p5h82qjp7fnx0s0shn2i19ig186cizh2x";
       type = "gem";
     };
-    version = "0.3.1";
+    version = "0.3.2";
   };
   eventmachine = {
     groups = ["default"];
@@ -162,10 +202,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9";
+      sha256 = "1bwssjgl9nfq9jhn9bfc7pqfl2c2xi0wnpng66l029m03kmdq8k4";
       type = "gem";
     };
-    version = "2.11.0";
+    version = "2.11.1";
   };
   hcl_parser = {
     dependencies = ["rhcl"];
@@ -184,10 +224,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
       type = "gem";
     };
-    version = "1.14.1";
+    version = "1.14.5";
   };
   jmespath = {
     groups = ["default"];
@@ -214,20 +254,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";
+      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
       type = "gem";
     };
-    version = "2.8.2";
+    version = "2.8.7";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
+      sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i";
+      type = "gem";
+    };
+    version = "5.24.1";
+  };
+  mutex_m = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
       type = "gem";
     };
-    version = "5.18.1";
+    version = "0.2.0";
   };
   nokogiri = {
     dependencies = ["mini_portile2" "racc"];
@@ -235,20 +285,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7";
+      sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
       type = "gem";
     };
-    version = "1.15.3";
+    version = "1.16.6";
   };
   racc = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
+      sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.8.0";
   };
   rainbow = {
     groups = ["default"];
@@ -272,14 +322,15 @@
     version = "0.9.0";
   };
   rexml = {
+    dependencies = ["strscan"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5";
       type = "gem";
     };
-    version = "3.2.5";
+    version = "3.3.2";
   };
   rhcl = {
     dependencies = ["deep_merge"];
@@ -298,10 +349,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
+      sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
       type = "gem";
     };
-    version = "3.12.0";
+    version = "3.13.0";
   };
   rspec-core = {
     dependencies = ["rspec-support"];
@@ -309,10 +360,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
+      sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm";
       type = "gem";
     };
-    version = "3.12.2";
+    version = "3.13.0";
   };
   rspec-expectations = {
     dependencies = ["diff-lcs" "rspec-support"];
@@ -320,10 +371,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
+      sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41";
       type = "gem";
     };
-    version = "3.12.3";
+    version = "3.13.1";
   };
   rspec-mocks = {
     dependencies = ["diff-lcs" "rspec-support"];
@@ -331,20 +382,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2";
+      sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88";
       type = "gem";
     };
-    version = "3.12.5";
+    version = "3.13.1";
   };
   rspec-support = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
+      sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
       type = "gem";
     };
-    version = "3.12.1";
+    version = "3.13.1";
   };
   rspec-terraspace = {
     dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"];
@@ -367,16 +418,26 @@
     };
     version = "2.3.2";
   };
+  strscan = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
   terraspace = {
     dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zhcdaiq0sgk2gcy4krkzm4qrvcaibkf5n755qgqgcp1f1b0w6gl";
+      sha256 = "1zmnp71fwcj453cafmb8iicbk93flk98wh0wdk0q9xd3mgm3qh6x";
       type = "gem";
     };
-    version = "2.2.8";
+    version = "2.2.17";
   };
   terraspace-bundler = {
     dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"];
@@ -404,20 +465,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg";
+      sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.3.1";
   };
   tilt = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
+      sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.4.0";
   };
   tty-tree = {
     groups = ["default"];
@@ -445,10 +506,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk";
+      sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp";
       type = "gem";
     };
-    version = "2.6.8";
+    version = "2.6.16";
   };
   zip_folder = {
     dependencies = ["rubyzip"];
diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix
index 4591b0946d93a..f26371d647117 100644
--- a/pkgs/applications/networking/cluster/weave-gitops/default.nix
+++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
     description = "Weave Gitops CLI";
     license = licenses.mpl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gitops";
   };
 }
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index e8b62033f350b..c28b48bba1639 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
     homepage = "https://github.com/odeke-em/drive";
     description = "Google Drive client for the commandline";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "drive";
   };
 }
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 994118a143482..cf8897b444f2f 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst";
     description = "Chatbot designed to be simple to extend with plugins written in Python";
     homepage = "http://errbot.io/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     # flaky on darwin, "RuntimeError: can't start new thread"
diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix
index 9c0053051db11..308fd0c2e5af9 100644
--- a/pkgs/applications/networking/firewalld/default.nix
+++ b/pkgs/applications/networking/firewalld/default.nix
@@ -99,6 +99,6 @@ stdenv.mkDerivation rec {
     description = "Firewall daemon with D-Bus interface";
     homepage = "https://github.com/firewalld/firewalld";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix
index a338bb8d5e3d0..be04282fcb8f7 100644
--- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix
+++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     homepage = "https://alfaview.com";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "alfaview";
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index e1bc3b3b560fc..732f121f9dfaa 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.bluejeans.com";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 43a18d775f9ee..bd17cd2a12d83 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -7,7 +7,6 @@
 , fetchFromGitHub
 , jq
 , deltachat-rpc-server
-, libdeltachat
 , makeDesktopItem
 , makeWrapper
 , noto-fonts-color-emoji
@@ -51,8 +50,13 @@ buildNpmPackage rec {
   postPatch = ''
     test \
       $(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \
-      = $(pkg-config --modversion deltachat) \
-      || (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1)
+      = ${deltachat-rpc-server.version} \
+      || (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1)
+
+    test \
+      $(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \
+      = ${lib.versions.major electron.version} \
+      || (echo 'error: electron version doesn not match package-lock.json' && exit 1)
   '';
 
   nativeBuildInputs = [
@@ -66,7 +70,6 @@ buildNpmPackage rec {
 
   buildInputs = [
     deltachat-rpc-server
-    libdeltachat
   ] ++ lib.optionals stdenv.isDarwin [
     CoreServices
   ];
diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
index 2c3c6fd52ecb8..4f715a576acdf 100644
--- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
+++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -77,6 +77,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aligned-vec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -94,47 +100,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -142,15 +149,32 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+
+[[package]]
+name = "arg_enum_proc_macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
@@ -181,36 +205,35 @@ dependencies = [
 
 [[package]]
 name = "async-broadcast"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
 dependencies = [
- "event-listener 5.2.0",
- "event-listener-strategy 0.5.1",
+ "event-listener",
+ "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-channel"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
  "concurrent-queue",
- "event-listener 5.2.0",
- "event-listener-strategy 0.5.1",
+ "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-io"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
 dependencies = [
- "async-lock 3.3.0",
+ "async-lock",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
@@ -225,38 +248,29 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener",
+ "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-process"
-version = "2.2.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3"
+checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
 dependencies = [
  "async-channel",
  "async-io",
- "async-lock 3.3.0",
+ "async-lock",
  "async-signal",
  "async-task",
  "blocking",
  "cfg-if",
- "event-listener 5.2.0",
+ "event-listener",
  "futures-lite",
  "rustix",
  "tracing",
@@ -265,23 +279,23 @@ dependencies = [
 
 [[package]]
 name = "async-recursion"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.5"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
 dependencies = [
  "async-io",
- "async-lock 2.8.0",
+ "async-lock",
  "atomic-waker",
  "cfg-if",
  "futures-core",
@@ -289,24 +303,24 @@ dependencies = [
  "rustix",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.7.0"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.79"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -334,15 +348,38 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "av1-grain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
+dependencies = [
+ "anyhow",
+ "arrayvec",
+ "log",
+ "nom",
+ "num-rational",
+ "v_frame",
+]
+
+[[package]]
+name = "avif-serialize"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
+dependencies = [
+ "arrayvec",
+]
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -359,6 +396,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -382,15 +425,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitstream-io"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -425,41 +474,44 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
  "async-channel",
- "async-lock 3.3.0",
  "async-task",
- "fastrand",
  "futures-io",
  "futures-lite",
  "piper",
- "tracing",
 ]
 
 [[package]]
 name = "blurhash"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565b78e03039f24994c5bc87ff793987be98a9ff59fa4851b72bc2e630001c9d"
+checksum = "2415c16381be1178c8a3b9d9d67d364406c8c097894d8ae27202a00a7accedb3"
 dependencies = [
  "gdk-pixbuf",
- "image",
+ "image 0.25.2",
 ]
 
+[[package]]
+name = "built"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
+
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
@@ -467,19 +519,25 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 
 [[package]]
 name = "cairo-rs"
-version = "0.19.2"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c"
+checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -508,9 +566,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 dependencies = [
  "jobserver",
  "libc",
@@ -518,9 +576,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -534,9 +592,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chacha20"
@@ -564,15 +622,17 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
+ "js-sys",
  "num-traits",
  "serde",
- "windows-targets 0.52.4",
+ "wasm-bindgen",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -594,15 +654,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -640,9 +700,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -668,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -700,15 +760,14 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
-source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b"
+version = "4.1.3"
+source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "serde",
  "subtle",
@@ -717,19 +776,19 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek-derive"
-version = "0.1.0"
-source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b"
+version = "0.1.1"
+source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "derivative"
@@ -750,7 +809,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -766,13 +825,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -783,9 +842,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "endi"
@@ -795,9 +854,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -805,13 +864,13 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -859,9 +918,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -869,26 +928,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "2.5.3"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -897,21 +939,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 5.2.0",
+ "event-listener",
  "pin-project-lite",
 ]
 
@@ -933,9 +965,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "fdeflate"
@@ -948,9 +980,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.7"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "field-offset"
@@ -970,16 +1002,17 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flare"
-version = "0.14.3"
+version = "0.15.0"
 dependencies = [
  "ashpd",
  "blurhash",
+ "chrono",
  "env_logger",
  "err-derive",
  "futures",
  "gettext-rs",
  "gtk4",
- "image",
+ "image 0.24.9",
  "lazy_static",
  "libadwaita",
  "libsignal-service",
@@ -1002,9 +1035,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1016,7 +1049,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
- "spin 0.9.8",
+ "spin",
 ]
 
 [[package]]
@@ -1119,7 +1152,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1163,9 +1196,9 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.19.2"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92"
+checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699"
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
@@ -1175,9 +1208,9 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96"
+checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -1188,9 +1221,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b"
+checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
 dependencies = [
  "cairo-rs",
  "gdk-pixbuf",
@@ -1203,9 +1236,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-sys"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626"
+checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1220,9 +1253,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-wayland"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fc91be838be766ff038221e068e05e4083f3b6cf48ef1f5251ba28f98f80bf"
+checksum = "f620a0ecbe4c574e3fec6bef6bebcefe19cb1b9a81569245ca4503c95f9b1371"
 dependencies = [
  "gdk4",
  "gdk4-wayland-sys",
@@ -1233,9 +1266,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-wayland-sys"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5cdc6c5cb3f64ba9b810782077939a0fc8d82e809f0147054bbe41910ac2b51"
+checksum = "7a5fd3927c917184b0e8712624eebabdc7f0909b645d468c825f8ec627e61803"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1244,9 +1277,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-x11"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff98d3e61807ecc1ddd15cf746b9de14fb6499fc259ca9e8d87d92e8901c7db"
+checksum = "ec6da3e3527007c14b27ddafe19496c49696a2a74dccb6ab75ba58dfa478b7ab"
 dependencies = [
  "gdk4",
  "gdk4-x11-sys",
@@ -1257,9 +1290,9 @@ dependencies = [
 
 [[package]]
 name = "gdk4-x11-sys"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30406b31a7c355c73c504c9b31d35806397944165730eca7db46f0409abf8f8f"
+checksum = "0bb4e987ec77b7b2fb72c0943ccbec5c3834d9d7165fe762af8ff2414f0ae23d"
 dependencies = [
  "gdk4-sys",
  "glib-sys",
@@ -1279,9 +1312,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1331,15 +1364,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "gio"
-version = "0.19.3"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f"
+checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1355,9 +1388,9 @@ dependencies = [
 
 [[package]]
 name = "gio-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4"
+checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -1368,11 +1401,11 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.19.3"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf"
+checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -1390,22 +1423,22 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.19.3"
+version = "0.19.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d"
+checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "glib-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4"
+checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5"
 dependencies = [
  "libc",
  "system-deps",
@@ -1419,9 +1452,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "gobject-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979"
+checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1430,9 +1463,9 @@ dependencies = [
 
 [[package]]
 name = "graphene-rs"
-version = "0.19.2"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91"
+checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf"
 dependencies = [
  "glib",
  "graphene-sys",
@@ -1441,9 +1474,9 @@ dependencies = [
 
 [[package]]
 name = "graphene-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0"
+checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1453,9 +1486,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e"
+checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
 dependencies = [
  "cairo-rs",
  "gdk4",
@@ -1468,9 +1501,9 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738"
+checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -1484,9 +1517,9 @@ dependencies = [
 
 [[package]]
 name = "gtk4"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83"
+checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
 dependencies = [
  "cairo-rs",
  "field-offset",
@@ -1505,23 +1538,21 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567"
+checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
 dependencies = [
- "anyhow",
  "proc-macro-crate 3.1.0",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "gtk4-sys"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18"
+checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1551,15 +1582,15 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "tracing",
 ]
 
 [[package]]
 name = "half"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -1567,9 +1598,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "headers"
@@ -1577,7 +1608,7 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "bytes",
  "headers-core",
  "http 0.2.12",
@@ -1595,12 +1626,6 @@ dependencies = [
  "http 0.2.12",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1613,6 +1638,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -1643,15 +1674,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "html-escape"
 version = "0.2.13"
@@ -1696,9 +1718,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
@@ -1714,9 +1736,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1816,6 +1838,45 @@ dependencies = [
  "tiff",
 ]
 
+[[package]]
+name = "image"
+version = "0.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "color_quant",
+ "exr",
+ "gif",
+ "image-webp",
+ "num-traits",
+ "png",
+ "qoi",
+ "ravif",
+ "rayon",
+ "rgb",
+ "tiff",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
+]
+
+[[package]]
+name = "imgref"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -1838,22 +1899,30 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.11.0"
+name = "interpolate_name"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
- "either",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -1871,9 +1940,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
@@ -1898,11 +1967,11 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.5.2",
+ "spin",
 ]
 
 [[package]]
@@ -1945,9 +2014,20 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
 
 [[package]]
 name = "libm"
@@ -1958,7 +2038,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 [[package]]
 name = "libsignal-core"
 version = "0.1.0"
-source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2"
 dependencies = [
  "num_enum",
  "uuid",
@@ -1967,7 +2047,7 @@ dependencies = [
 [[package]]
 name = "libsignal-protocol"
 version = "0.1.0"
-source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2"
 dependencies = [
  "aes",
  "aes-gcm-siv",
@@ -1981,7 +2061,7 @@ dependencies = [
  "hkdf",
  "hmac",
  "indexmap",
- "itertools 0.12.1",
+ "itertools",
  "libsignal-core",
  "log",
  "num_enum",
@@ -1991,9 +2071,9 @@ dependencies = [
  "prost-build",
  "rand",
  "rayon",
+ "serde",
  "sha2",
  "signal-crypto",
- "static_assertions",
  "subtle",
  "thiserror",
  "uuid",
@@ -2003,12 +2083,12 @@ dependencies = [
 [[package]]
 name = "libsignal-service"
 version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c072491aa3e2b604b45b9f2b764552b7d382898c#c072491aa3e2b604b45b9f2b764552b7d382898c"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1b591540b908112816be131d6baa6eafba2129cb#1b591540b908112816be131d6baa6eafba2129cb"
 dependencies = [
  "aes",
  "aes-gcm",
  "async-trait",
- "base64",
+ "base64 0.21.7",
  "bincode",
  "bytes",
  "cbc",
@@ -2038,7 +2118,7 @@ dependencies = [
 [[package]]
 name = "libsignal-service-hyper"
 version = "0.1.0"
-source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c072491aa3e2b604b45b9f2b764552b7d382898c#c072491aa3e2b604b45b9f2b764552b7d382898c"
+source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1b591540b908112816be131d6baa6eafba2129cb#1b591540b908112816be131d6baa6eafba2129cb"
 dependencies = [
  "async-trait",
  "async-tungstenite",
@@ -2098,9 +2178,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "locale_config"
@@ -2117,9 +2197,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2127,9 +2207,18 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
 
 [[package]]
 name = "lru-cache"
@@ -2149,11 +2238,31 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "maybe-rayon"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+dependencies = [
+ "cfg-if",
+ "rayon",
+]
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
@@ -2172,9 +2281,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -2188,9 +2297,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -2231,17 +2340,23 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.8.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nix"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -2258,11 +2373,17 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "noop_proc_macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
+
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -2274,11 +2395,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -2303,13 +2423,24 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -2321,9 +2452,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2332,11 +2463,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -2344,9 +2474,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -2357,7 +2487,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -2379,7 +2509,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2413,9 +2543,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
 dependencies = [
  "memchr",
 ]
@@ -2434,23 +2564,26 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2"
 
 [[package]]
 name = "oo7"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82"
+checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24"
 dependencies = [
  "aes",
  "cbc",
  "cipher",
  "digest",
+ "endi",
  "futures-util",
  "hkdf",
  "hmac",
+ "md-5",
  "num",
  "num-bigint-dig",
  "pbkdf2",
  "rand",
  "serde",
  "sha2",
+ "subtle",
  "tokio",
  "zbus",
  "zeroize",
@@ -2481,9 +2614,9 @@ dependencies = [
 
 [[package]]
 name = "pango"
-version = "0.19.3"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1"
+checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd"
 dependencies = [
  "gio",
  "glib",
@@ -2493,9 +2626,9 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea"
+checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -2551,9 +2684,15 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -2572,9 +2711,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -2582,14 +2721,14 @@ dependencies = [
 
 [[package]]
 name = "phonenumber"
-version = "0.3.3+8.13.9"
+version = "0.3.6+8.13.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06"
+checksum = "11756237b57b8cc5e97dc8b1e70ea436324d30e7075de63b14fd15073a8f692a"
 dependencies = [
  "bincode",
  "either",
  "fnv",
- "itertools 0.11.0",
+ "itertools",
  "lazy_static",
  "nom",
  "quick-xml",
@@ -2618,7 +2757,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2635,9 +2774,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "piper"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
  "atomic-waker",
  "fastrand",
@@ -2650,12 +2789,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "platforms"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
-
 [[package]]
 name = "png"
 version = "0.17.13"
@@ -2672,23 +2805,22 @@ dependencies = [
 [[package]]
 name = "poksho"
 version = "0.7.0"
-source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2"
 dependencies = [
  "curve25519-dalek",
  "hmac",
  "sha2",
- "subtle",
 ]
 
 [[package]]
 name = "polling"
-version = "3.6.0"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix",
  "tracing",
@@ -2757,10 +2889,10 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb"
 
 [[package]]
 name = "presage"
-version = "0.6.1"
-source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e"
+version = "0.6.2"
+source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "futures",
  "hex",
  "libsignal-service",
@@ -2778,7 +2910,7 @@ dependencies = [
 [[package]]
 name = "presage-store-cipher"
 version = "0.1.0"
-source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e"
+source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f"
 dependencies = [
  "blake3",
  "chacha20poly1305",
@@ -2795,10 +2927,11 @@ dependencies = [
 [[package]]
 name = "presage-store-sled"
 version = "0.6.0-dev"
-source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e"
+source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f"
 dependencies = [
  "async-trait",
- "base64",
+ "base64 0.21.7",
+ "chrono",
  "fs_extra",
  "log",
  "presage",
@@ -2815,12 +2948,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2868,18 +3001,37 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "profiling"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+dependencies = [
+ "quote",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -2887,13 +3039,13 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
  "bytes",
- "heck 0.4.1",
- "itertools 0.11.0",
+ "heck",
+ "itertools",
  "log",
  "multimap",
  "once_cell",
@@ -2902,29 +3054,28 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.57",
+ "syn 2.0.72",
  "tempfile",
- "which",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
+ "itertools",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
  "prost",
 ]
@@ -2945,7 +3096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159"
 dependencies = [
  "html-escape",
- "image",
+ "image 0.24.9",
  "qrcodegen",
 ]
 
@@ -2955,11 +3106,17 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quick-xml"
-version = "0.28.2"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
 dependencies = [
  "memchr",
 ]
@@ -2977,9 +3134,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -3014,6 +3171,57 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rav1e"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
+dependencies = [
+ "arbitrary",
+ "arg_enum_proc_macro",
+ "arrayvec",
+ "av1-grain",
+ "bitstream-io",
+ "built",
+ "cfg-if",
+ "interpolate_name",
+ "itertools",
+ "libc",
+ "libfuzzer-sys",
+ "log",
+ "maybe-rayon",
+ "new_debug_unreachable",
+ "noop_proc_macro",
+ "num-derive",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "profiling",
+ "rand",
+ "rand_chacha",
+ "simd_helpers",
+ "system-deps",
+ "thiserror",
+ "v_frame",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ravif"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85be49d628515bb99a01c44200009f0a4167c252f036445b975b35daf952258c"
+dependencies = [
+ "avif-serialize",
+ "bitstream-io",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rayon",
+ "rgb",
+]
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -3045,25 +3253,25 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3086,9 +3294,18 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "rgb"
+version = "0.8.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
+dependencies = [
+ "bytemuck",
+]
 
 [[package]]
 name = "ring"
@@ -3100,16 +3317,16 @@ dependencies = [
  "cfg-if",
  "getrandom",
  "libc",
- "spin 0.9.8",
+ "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
@@ -3122,11 +3339,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -3149,9 +3366,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
+checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
@@ -3162,25 +3379,25 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
 dependencies = [
- "base64",
+ "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.4.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.2"
+version = "0.102.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3189,15 +3406,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "schannel"
@@ -3216,11 +3433,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3229,9 +3446,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3239,35 +3456,35 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa",
  "ryu",
@@ -3276,20 +3493,20 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -3319,7 +3536,7 @@ dependencies = [
 [[package]]
 name = "signal-crypto"
 version = "0.1.0"
-source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2"
 dependencies = [
  "aes",
  "cbc",
@@ -3335,9 +3552,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -3348,6 +3565,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "simd_helpers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
+dependencies = [
+ "quote",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -3381,9 +3607,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -3424,12 +3650,6 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -3447,31 +3667,31 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "strum"
-version = "0.24.1"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.24.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 1.0.109",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -3486,9 +3706,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.57"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3514,7 +3734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
  "cfg-expr",
- "heck 0.5.0",
+ "heck",
  "pkg-config",
  "toml",
  "version-compare",
@@ -3522,9 +3742,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
 
 [[package]]
 name = "temp-dir"
@@ -3546,22 +3766,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3577,9 +3797,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3592,9 +3812,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3621,13 +3841,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3657,35 +3877,34 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.9",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -3714,15 +3933,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.9"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
  "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.5",
+ "winnow 0.6.14",
 ]
 
 [[package]]
@@ -3751,7 +3970,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3871,9 +4090,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3895,19 +4114,30 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "v_frame"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+dependencies = [
+ "aligned-vec",
+ "num-traits",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -3956,7 +4186,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
@@ -3978,7 +4208,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3995,18 +4225,6 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -4035,7 +4253,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4053,7 +4271,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4073,17 +4291,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -4094,9 +4313,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4106,9 +4325,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4118,9 +4337,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4130,9 +4355,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4142,9 +4367,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4154,9 +4379,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4166,9 +4391,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
@@ -4181,9 +4406,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f"
 dependencies = [
  "memchr",
 ]
@@ -4202,27 +4427,26 @@ dependencies = [
 
 [[package]]
 name = "xdg-home"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "zbus"
-version = "4.1.2"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
 dependencies = [
  "async-broadcast",
  "async-process",
  "async-recursion",
  "async-trait",
- "derivative",
  "enumflags2",
- "event-listener 5.2.0",
+ "event-listener",
  "futures-core",
  "futures-sink",
  "futures-util",
@@ -4246,15 +4470,14 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "4.1.2"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "regex",
- "syn 1.0.109",
+ "syn 2.0.72",
  "zvariant_utils",
 ]
 
@@ -4271,9 +4494,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -4286,28 +4509,32 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "zkcredential"
 version = "0.1.0"
-source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2"
 dependencies = [
+ "cfg-if",
  "curve25519-dalek",
  "derive-where",
  "displaydoc",
  "lazy_static",
  "partial-default",
  "poksho",
+ "rayon",
  "serde",
+ "sha2",
  "subtle",
+ "thiserror",
 ]
 
 [[package]]
 name = "zkgroup"
 version = "0.9.0"
-source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0"
+source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2"
 dependencies = [
  "aes-gcm-siv",
  "bincode",
@@ -4319,16 +4546,26 @@ dependencies = [
  "hkdf",
  "lazy_static",
  "libsignal-core",
+ "num_enum",
  "partial-default",
  "poksho",
+ "rand",
+ "rayon",
  "serde",
  "sha2",
  "signal-crypto",
  "subtle",
+ "thiserror",
  "uuid",
  "zkcredential",
 ]
 
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"
@@ -4338,11 +4575,20 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "zune-jpeg"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
+dependencies = [
+ "zune-core",
+]
+
 [[package]]
 name = "zvariant"
-version = "4.0.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
 dependencies = [
  "endi",
  "enumflags2",
@@ -4354,24 +4600,24 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "4.0.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.72",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_utils"
-version = "1.1.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.72",
 ]
diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
index b22963c476a79..6614d54ff696c 100644
--- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
@@ -21,23 +21,23 @@
 
 stdenv.mkDerivation rec {
   pname = "flare";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     rev = version;
-    hash = "sha256-e/XkY5xULYnx5zBB3pxjBSocufK85xzb2t+kVXxhFNg=";
+    hash = "sha256-sIT4oEmIV8TJ5MMxg3vxkvK+7PaIy/01kN9I2FTsfo0=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "curve25519-dalek-4.1.1" = "sha256-p9Vx0lAaYILypsI4/RVsHZLOqZKaa4Wvf7DanLA38pc=";
-      "libsignal-core-0.1.0" = "sha256-p4YzrtJaQhuMBTtquvS1m9llszfyTeDfl7+IXzRUFSE=";
-      "libsignal-service-0.1.0" = "sha256-rXa/7AmCt03WvMPqrOxPkQlNrMvJQuodEkBuqYo9sFQ=";
-      "presage-0.6.1" = "sha256-4rH/Yt//0EpF8KQQXkurX5m9tMrFRI2MaJ+IzddVUUU=";
+      "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";
+      "libsignal-core-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M=";
+      "libsignal-service-0.1.0" = "sha256-UMQqp6hfyVtUwkAqsw/xsn7UrGul/F4WVC/Oy5s+hqA=";
+      "presage-0.6.2" = "sha256-4E23mzXwb5gcj0XpXB17a5BD96+ZAl7dh5I6vMvE9Kg=";
     };
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index c5ac50f675de5..2fa65fddfd1d0 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -17,6 +17,6 @@ buildGoModule {
     mainProgram = "mm";
     homepage = "https://git.lost.host/meutraa/mm";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix
index b6fbbd68401f1..b931cdb05a9d9 100644
--- a/pkgs/applications/networking/instant-messengers/neosay/default.nix
+++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix
@@ -23,6 +23,6 @@ buildGoModule rec {
     mainProgram = "neosay";
     homepage = "https://github.com/donuts-are-good/neosay";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
index f702a667ae16f..d24504f8260ca 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "XEP-0280: Message Carbons plugin for libpurple";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
index d7c3c6cacabd9..fc877115ad15b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "SkypeWeb plugin for Pidgin";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
index 217b87c26abae..4fb4a1c1c26dc 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
     description = "Native Google Chat support for pidgin";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
index 4989c36d83445..1b84b1a93ab22 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "Libpurple plugin for sending and receiving SMS via Modemmanager";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
index c5437e965ed87..bcc09b1f6481e 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     description = "Pidgin plugin that merges the Buddy List window with a conversation window";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
index c251258772bfa..79c501a2e6ce6 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop-beta";
   dir = "Signal Beta";
-  version = "7.17.0-beta.1";
+  version = "7.18.0-beta.1";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-sK42Bqh+j4b8SduZk6eMhgBhRMG0q/ee5lAqFYVc4Tg=";
+  hash = "sha256-ZNFssB0SiNAAW7SupxNqdbEtEpemrv+IoyfdWVKu8CI=";
 }
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
index 26d43cf11da09..ebe2cbc9d9a2d 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "7.16.0";
+  version = "7.17.0";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-DfPQb3TGhVVZ7webNoMmyhjhRKKO3lWf12ZIpi7D7tc=";
+  hash = "sha256-4Yp81aBY01cVZ/KDSqPO3R3HglLup/+sczQ5XNtQn84=";
 }
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index b03446d889811..a7c302dbd4b62 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
     description = "Slack client for your terminal";
     homepage = "https://github.com/erroneousboat/slack-term";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "slack-term";
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index e27bbcdb1bca6..3a26639e2ed91 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -45,14 +45,14 @@ let
 
   pname = "slack";
 
-  x86_64-darwin-version = "4.38.121";
-  x86_64-darwin-sha256 = "1w0s6j8z8961sv4y00jxpy5gjlj0dswyxs15c7isb26ii11nn1i2";
+  x86_64-darwin-version = "4.39.90";
+  x86_64-darwin-sha256 = "0wdvsw0m1jks1n97anzamssicl9jfx9js480q3kl9hd80viz97lq";
 
-  x86_64-linux-version = "4.38.125";
-  x86_64-linux-sha256 = "sha256-BJeFXZ8STbMCmGvYRoFsfsyIpGukQkuwv0m2NzE+89c=";
+  x86_64-linux-version = "4.39.90";
+  x86_64-linux-sha256 = "00ygbka304xnh99s17hh51lxjdkv2flh6nmn143dkj7qqabgrll8";
 
-  aarch64-darwin-version = "4.38.121";
-  aarch64-darwin-sha256 = "161z947p7a2d7584hybl77chab8y027cqpph2hd2s4b5k6bchkj5";
+  aarch64-darwin-version = "4.39.90";
+  aarch64-darwin-sha256 = "0rm0khbf2bqxs2ddlmss7m3sb5yy05lb96kv0a065ifadzcf5zsb";
 
   version = {
     x86_64-darwin = x86_64-darwin-version;
@@ -65,15 +65,15 @@ let
     base = "https://downloads.slack-edge.com";
   in {
     x86_64-darwin = fetchurl {
-      url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
+      url = "${base}/desktop-releases/mac/universal/${version}/Slack-${version}-macOS.dmg";
       sha256 = x86_64-darwin-sha256;
     };
     x86_64-linux = fetchurl {
-      url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb";
+      url = "${base}/desktop-releases/linux/x64/${version}/slack-desktop-${version}-amd64.deb";
       sha256 = x86_64-linux-sha256;
     };
     aarch64-darwin = fetchurl {
-      url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
+      url = "${base}/desktop-releases/mac/arm64/${version}/Slack-${version}-macOS.dmg";
       sha256 = aarch64-darwin-sha256;
     };
   }.${system} or throwSystem;
diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh
index eacd7b4284c71..8b66e30002843 100755
--- a/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -19,9 +19,9 @@ if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \
   exit 0
 fi
 
-linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb"
-mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
-mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg"
+linux_url="https://downloads.slack-edge.com/desktop-releases/linux/x64/${latest_linux_version}/slack-desktop-${latest_linux_version}-amd64.deb"
+mac_url="https://downloads.slack-edge.com/desktop-releases/mac/universal/${latest_mac_version}/Slack-${latest_mac_version}-macOS.dmg"
+mac_arm_url="https://downloads.slack-edge.com/desktop-releases/mac/arm64/${latest_mac_version}/Slack-${latest_mac_version}-macOS.dmg"
 linux_sha256=$(nix-prefetch-url ${linux_url})
 mac_sha256=$(nix-prefetch-url ${mac_url})
 mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url})
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 9a8e547b70eb4..4054219850b42 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Logger service for Telepathy framework";
     homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 03465b1314faa..92daa59ae415f 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     description = "Account manager and channel dispatcher for the Telepathy framework";
     homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index dfcb9facfd8ed..d6d403322c057 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -90,7 +90,7 @@ buildPythonPackage rec {
     mainProgram = "turses";
     homepage = "https://github.com/louipc/turses";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index d809337de02f4..706904a8dd2c1 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     mainProgram = "utox";
     homepage = "https://github.com/uTox/uTox";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix
index d5c0cad075b39..c493cae6d4637 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/pkgs/applications/networking/irc/glowing-bear/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Web client for Weechat";
     homepage = "https://github.com/glowing-bear/glowing-bear";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 46cb08594ee05..e51e6f061b07a 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "WeeChat script in Lua that implements the matrix.org chat protocol";
     homepage = "https://github.com/torhve/weechat-matrix-protocol-script";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53
     platforms = platforms.unix;
 
diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix
index b0eb919cb4c2b..c976b7f82628e 100644
--- a/pkgs/applications/networking/iroh/default.nix
+++ b/pkgs/applications/networking/iroh/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "iroh";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-1ke1S5IBrg8XYO67iUaH0T4dA59TkyqelsghIK+TuyM=";
+    hash = "sha256-g/x5lVVrm1NrJbqmhza/wryEwuXHh1tDBf+x6vL+2n0=";
   };
 
-  cargoHash = "sha256-O6HHZtZes8BO2XuCMdVuuHphzYiqkS5axbYIxsGZw6k=";
+  cargoHash = "sha256-Sp2yMF/M3SuNB1DDQ79Lau5IxtSM1NPLJi9TnHWqnuc=";
 
   buildInputs = lib.optionals stdenv.isDarwin (
     with darwin.apple_sdk.frameworks; [
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 3c933eaa4b8a7..6de6838eeeda1 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     mainProgram = "muchsync";
     homepage = "http://www.muchsync.org/";
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [];
+    maintainers = [ ];
     license = lib.licenses.gpl2Plus;
   };
 }
diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix
index b5db5573ab874..19e108f45a318 100644
--- a/pkgs/applications/networking/p2p/stig/default.nix
+++ b/pkgs/applications/networking/p2p/stig/default.nix
@@ -64,6 +64,6 @@ python310Packages.buildPythonApplication rec {
     description = "TUI and CLI for the BitTorrent client Transmission";
     homepage = "https://github.com/rndusr/stig";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [  ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix
index 6dc00cba9ee08..e246017576851 100644
--- a/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/pkgs/applications/networking/p2p/vuze/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.vuze.com";
     license = licenses.unfree;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
index 5f9ef27201e35..e223dfad5abe7 100644
--- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
@@ -151,6 +151,6 @@ stdenv.mkDerivation {
     homepage = "https://www.vmware.com/go/viewclients";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 848590d4cb873..551f8e57f7a08 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -62,7 +62,7 @@ qt5.mkDerivation rec {
     description = "Graphical NoMachine NX3 remote desktop client";
     mainProgram = "x2goclient";
     homepage = "http://x2go.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix
index 655626d07e262..7cadaee0e2038 100644
--- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix
+++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
     mainProgram = "qtwirediff";
     homepage = "https://github.com/aaptel/qtwirediff";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix
index 7207617a11665..c1a4dab8f7094 100644
--- a/pkgs/applications/networking/station/default.nix
+++ b/pkgs/applications/networking/station/default.nix
@@ -32,7 +32,7 @@ in appimageTools.wrapType2 rec {
     homepage = "https://getstation.com";
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "station";
   };
 }
diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix
index e6a474abd72df..28663a6e68660 100644
--- a/pkgs/applications/networking/trayscale/default.nix
+++ b/pkgs/applications/networking/trayscale/default.nix
@@ -50,7 +50,7 @@ buildGoModule rec {
     description = "Unofficial GUI wrapper around the Tailscale CLI client";
     homepage = "https://github.com/DeedleFake/trayscale";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "trayscale";
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 7478461947299..f19573bace985 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -77,7 +77,7 @@ in
       description = "ZNC clientaway module";
       homepage = "https://github.com/kylef/znc-contrib";
       license = licenses.gpl2;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -117,7 +117,7 @@ in
       description = "ZNC ignore module";
       homepage = "https://github.com/kylef/znc-contrib";
       license = licenses.gpl2;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
deleted file mode 100644
index d00600bbea592..0000000000000
--- a/pkgs/applications/office/fava/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, python3, fetchPypi }:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "fava";
-  version = "1.27.3";
-  format = "pyproject";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-GsnXZaazEiOhyjbIinHRD1fdoqlAp3d5csrmtydxmGM=";
-  };
-
-  nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    babel
-    beancount
-    cheroot
-    click
-    flask
-    flask-babel
-    jaraco-functools
-    jinja2
-    markdown2
-    ply
-    simplejson
-    werkzeug
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'setuptools_scm>=8.0' 'setuptools_scm'
-  '';
-
-  preCheck = ''
-    export HOME=$TEMPDIR
-  '';
-
-  disabledTests = [
-    # runs fava in debug mode, which tries to interpret bash wrapper as Python
-    "test_cli"
-  ];
-
-  meta = with lib; {
-    description = "Web interface for beancount";
-    mainProgram = "fava";
-    homepage = "https://beancount.github.io/fava";
-    changelog = "https://beancount.github.io/fava/changelog.html";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bhipple ];
-  };
-}
diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix
index 0bca134753385..b31eb4588c3f8 100644
--- a/pkgs/applications/office/ktimetracker/default.nix
+++ b/pkgs/applications/office/ktimetracker/default.nix
@@ -28,6 +28,6 @@ kio knotifications kwindowsystem kxmlgui ktextwidgets
     mainProgram = "ktimetracker";
     license = licenses.gpl2;
     homepage = "https://userbase.kde.org/KTimeTracker";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
index fed47d637f266..0cdbe16e11335 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -124,7 +124,7 @@ in stdenv.mkDerivation {
     homepage = "https://www.softmaker.com/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
index 975d4571a16e9..5fa2638042e72 100644
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@@ -82,6 +82,6 @@ mkDerivation rec {
     mainProgram = "plasmaphonedialer";
     homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
index 67164f548d1e0..a3d62cc4a7889 100644
--- a/pkgs/applications/plasma-mobile/plasma-phonebook.nix
+++ b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
@@ -37,6 +37,6 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook";
     # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix
index c30cda1cd8393..c0e58b6653c77 100644
--- a/pkgs/applications/plasma-mobile/plasma-settings.nix
+++ b/pkgs/applications/plasma-mobile/plasma-settings.nix
@@ -53,6 +53,6 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/plasma-mobile/plasma-settings";
     # https://invent.kde.org/plasma-mobile/plasma-settings/-/commit/a59007f383308503e59498b3036e1483bca26e35
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
index 8dce4192a08c1..4e38649d47e71 100644
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -52,6 +52,6 @@ mkDerivation {
     mainProgram = "spacebar";
     homepage = "https://invent.kde.org/plasma-mobile/spacebar";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix
index 7c44bebcb0f04..02c4e74eb855b 100644
--- a/pkgs/applications/printing/pappl/default.nix
+++ b/pkgs/applications/printing/pappl/default.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/michaelrsweet/pappl";
     license = licenses.asl20;
     platforms = platforms.linux; # should also work for darwin, but requires additional work
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix
index 3488ddecde396..03e775738618a 100644
--- a/pkgs/applications/radio/aldo/default.nix
+++ b/pkgs/applications/radio/aldo/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
     description = "Morse code training program";
     homepage = "http://aldo.nongnu.org/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "aldo";
   };
diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix
index 337038fd32c2b..8d87096b44077 100644
--- a/pkgs/applications/radio/anytone-emu/default.nix
+++ b/pkgs/applications/radio/anytone-emu/default.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     description = "Tiny emulator for AnyTone radios";
     homepage = "https://github.com/hmatuschek/anytone-emu";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "anytone-emu";
   };
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix
index 292263c0f2691..e235d68d365bd 100644
--- a/pkgs/applications/radio/dmrconfig/default.nix
+++ b/pkgs/applications/radio/dmrconfig/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/sergev/dmrconfig";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "dmrconfig";
   };
diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix
index 620923377add3..f23add3215760 100644
--- a/pkgs/applications/radio/dsd/default.nix
+++ b/pkgs/applications/radio/dsd/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/szechyjs/dsd";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "dsd";
   };
 }
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix
index 93613cb5faa76..ac28698a46097 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/applications/radio/pothos/default.nix
@@ -76,6 +76,6 @@ mkDerivation rec {
     homepage = "https://github.com/pothosware/PothosCore/wiki";
     license = licenses.boost;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix
index aad62602889d3..c6d8920f828d4 100644
--- a/pkgs/applications/radio/tlf/default.nix
+++ b/pkgs/applications/radio/tlf/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://tlf.github.io/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix
index ddc7bff44563d..88b402712016b 100644
--- a/pkgs/applications/science/biology/mrbayes/default.nix
+++ b/pkgs/applications/science/biology/mrbayes/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       MrBayes uses a simulation technique called Markov chain Monte Carlo (or
       MCMC) to approximate the posterior probabilities of trees.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     homepage = "https://nbisweden.github.io/MrBayes/";
     platforms = platforms.linux;
diff --git a/pkgs/applications/science/biology/sratoolkit/default.nix b/pkgs/applications/science/biology/sratoolkit/default.nix
deleted file mode 100644
index 62c21a23eb66a..0000000000000
--- a/pkgs/applications/science/biology/sratoolkit/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, autoPatchelfHook
-, libidn
-, zlib
-, bzip2
-}:
-
-
-let
-  libidn11 = libidn.overrideAttrs (old: {
-    pname = "libidn";
-    version = "1.34";
-    src = fetchurl {
-      url = "mirror://gnu/libidn/libidn-1.34.tar.gz";
-      sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
-    };
-  });
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "sratoolkit";
-  version = "2.11.3";
-
-  src = fetchurl {
-    url = "https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/${version}/sratoolkit.${version}-ubuntu64.tar.gz";
-    sha256 = "1590lc4cplxr3lhjqci8fjncy67imn2h14qd2l87chmhjh243qvx";
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    libidn11
-    zlib
-    bzip2
-    stdenv.cc.cc.lib
-  ];
-
-  sourceRoot = "sratoolkit.${version}-ubuntu64/bin";
-
-  installPhase = ''
-    find -L . -executable -type f -! -name "*remote-fuser*" -exec install -m755 -D {} $out/bin/{} \;
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/ncbi/sra-tools";
-    description = "SRA Toolkit and SDK from NCBI is a collection of tools and libraries for using data in the INSDC Sequence Read Archives";
-    license = licenses.ncbiPd;
-    maintainers = with maintainers; [ thyol ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix
index ced8c72d2155d..072faf3a8a5b9 100644
--- a/pkgs/applications/science/electronics/diylc/default.nix
+++ b/pkgs/applications/science/electronics/diylc/default.nix
@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix
index 2c63edc1e7d49..81be0baf5cde7 100644
--- a/pkgs/applications/science/logic/lean4/default.nix
+++ b/pkgs/applications/science/logic/lean4/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lean";
   };
 })
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 5c476be06e4e7..a82e44c8a5109 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation {
       the Otter Prover. This is the LADR command-line version.
     '';
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix
index eb70ea332b89b..9dbbe8455d1b2 100644
--- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "finalfrontier";
     homepage = "https://github.com/finalfusion/finalfrontier/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index d88c73bdcb7a7..b6fa984e7d5b0 100644
--- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
     description = "Utility for converting, quantizing, and querying word embeddings";
     homepage = "https://github.com/finalfusion/finalfusion-utils/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "finalfusion";
   };
 }
diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index d96d71695e757..37128ce67e39d 100644
--- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix
@@ -57,6 +57,6 @@ in stdenv.mkDerivation rec {
       url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html";
       free = false;
     };
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix
index 9ba028d1cb650..6e87136170c64 100644
--- a/pkgs/applications/science/math/bcal/default.nix
+++ b/pkgs/applications/science/math/bcal/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jarun/bcal";
     license = licenses.gpl3Only;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 2a84d4b27b141..0f36c4783df78 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
       Center (BVLC) and by community contributors.
     '';
     homepage = "http://caffe.berkeleyvision.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken =
       (pythonSupport && (python.isPy310))
       || cudaSupport
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 8accf9d76725a..18000c147d87e 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://getdp.info/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/math/nota/default.nix b/pkgs/applications/science/math/nota/default.nix
index 6b13c8160cfb3..3a98eacd47171 100644
--- a/pkgs/applications/science/math/nota/default.nix
+++ b/pkgs/applications/science/math/nota/default.nix
@@ -36,6 +36,6 @@ mkDerivation rec {
   description = "Most beautiful command line calculator";
   homepage = "https://kary.us/nota";
   license = lib.licenses.mpl20;
-  maintainers = with lib.maintainers; [ ];
+  maintainers = [ ];
   mainProgram = "nota";
 }
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index f1c9329c94df9..8cf8ceb497a84 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
     homepage = "http://vite.gforge.inria.fr/";
     license = lib.licenses.cecill20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix
index fb314cdff30ce..6350d0badee9f 100644
--- a/pkgs/applications/science/programming/groove/default.nix
+++ b/pkgs/applications/science/programming/groove/default.nix
@@ -50,6 +50,6 @@ in stdenv.mkDerivation rec {
     license = licenses.asl20;
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix
index d4a7a961d3984..ba79ddb237a4b 100644
--- a/pkgs/applications/science/robotics/mujoco/default.nix
+++ b/pkgs/applications/science/robotics/mujoco/default.nix
@@ -34,8 +34,8 @@ let
     eigen3 = fetchFromGitLab {
       owner = "libeigen";
       repo = "eigen";
-      rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b";
-      hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=";
+      rev = "33d0937c6bdf5ec999939fb17f2a553183d14a74";
+      hash = "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=";
     };
     googletest = fetchFromGitHub {
       owner = "google";
@@ -129,7 +129,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "mujoco";
-  version = "3.1.6";
+  version = "3.2.0";
 
   # Bumping version? Make sure to look though the MuJoCo's commit
   # history for bumped dependency pins!
@@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
     owner = "google-deepmind";
     repo = "mujoco";
     rev = "refs/tags/${version}";
-    hash = "sha256-64zUplr1E5WSb5RpTW9La1zKVT67a1VrftiUqc2SHlU=";
+    hash = "sha256-BCvWVOpViEhwvlBzXuj0hoN6W4z5vC8MeO91SsdQ+x4=";
   };
 
   patches = [ ./mujoco-system-deps-dont-fetch.patch ];
diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
index 6630cbaa1258f..8a33d222855eb 100644
--- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
+++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
@@ -56,7 +56,7 @@ mkDerivation rec {
     homepage = "https://github.com/Swordfish90/cool-retro-term";
     license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; linux ++ darwin;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "cool-retro-term";
   };
 }
diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix
index b05872b11e4de..83bac2343b97f 100644
--- a/pkgs/applications/terminal-emulators/mrxvt/default.nix
+++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/materm";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     knownVulnerabilities = [
       "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
     ];
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
index ac2a5f09fb0f1..fa356081a8703 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Change the urxvt font size on the fly";
     homepage = "https://github.com/majutsushi/urxvt-font-size";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
index f30507483fac1..64a1ed125ac80 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Perl extensions for the rxvt-unicode terminal emulator";
     homepage = "https://github.com/effigies/urxvt-perl";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
index c7510568e2641..2bfc9669338ad 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "urxvt plugin that allows to switch color themes during runtime";
     homepage = "https://github.com/felixr/urxvt-theme-switch";
     license = "CCBYNC";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix
index 2b7d9eb032f96..f9c3ac400d729 100644
--- a/pkgs/applications/version-management/datalad/default.nix
+++ b/pkgs/applications/version-management/datalad/default.nix
@@ -1,69 +1,82 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git, git-annex }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  installShellFiles,
+  python3,
+  git,
+  git-annex,
+  p7zip,
+  curl,
+  coreutils,
+}:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "datalad";
-  version = "1.0.2";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-oq+DdlWcwjJSQdnqHlYCa9I7iSOKf+hI35Lcv/GM24c=";
+    hash = "sha256-Vw/RpMf+jnUijJ3GZ9nLk1IRWOADmM+jNtYl5Ba6uLg=";
   };
 
-  nativeBuildInputs = [ installShellFiles git ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    # core
-    platformdirs
-    chardet
-    iso8601
-    humanize
-    fasteners
-    packaging
-    patool
-    tqdm
-    annexremote
-    looseversion
-    setuptools
-    git-annex
-
-    # downloaders-extra
-    # requests-ftp # not in nixpkgs yet
-
-    # downloaders
-    boto
-    keyrings-alt
-    keyring
-    msgpack
-    requests
-
-    # publish
-    python-gitlab
-
-    # misc
-    argcomplete
-    pyperclip
-    python-dateutil
-
-    # metadata
-    simplejson
-    whoosh
-
-    # metadata-extra
-    pyyaml
-    mutagen
-    exifread
-    python-xmp-toolkit
-    pillow
-
-    # duecredit
-    duecredit
+  postPatch = ''
+    substituteInPlace datalad/distribution/create_sibling.py \
+      --replace-fail "/bin/ls" "${coreutils}/bin/ls"
+  '';
 
-    # python>=3.8
-    distro
-  ] ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
-    ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ];
+  nativeBuildInputs = [
+    installShellFiles
+    git
+  ];
+
+  build-system = [ python3.pkgs.setuptools ];
+
+  dependencies =
+    with python3.pkgs;
+    [
+      # core
+      platformdirs
+      chardet
+      iso8601
+      humanize
+      fasteners
+      packaging
+      patool
+      tqdm
+      annexremote
+      looseversion
+      setuptools
+      git-annex
+
+      # downloaders-extra
+      # requests-ftp # not in nixpkgs yet
+
+      # downloaders
+      boto3
+      keyrings-alt
+      keyring
+      msgpack
+      requests
+
+      # publish
+      python-gitlab
+
+      # misc
+      argcomplete
+      pyperclip
+      python-dateutil
+      # duecredit
+      duecredit
+      # python>=3.8
+      distro
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
+    ++ lib.optionals (python3.pythonOlder "3.9") [ importlib-resources ]
+    ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ]
+    ++ lib.optionals (python3.pythonOlder "3.11") [ typing_extensions ];
 
   postInstall = ''
     installShellCompletion --cmd datalad \
@@ -72,15 +85,113 @@ python3.pkgs.buildPythonApplication rec {
     wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH"
   '';
 
-  # no tests
-  doCheck = false;
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  # tests depend on apps in $PATH which only will get installed after the test
+  disabledTests = [
+    # No such file or directory: 'datalad'
+    "test_script_shims"
+    "test_cfg_override"
+    "test_completion"
+    "test_nested_pushclone_cycle_allplatforms"
+    "test_create_sub_gh3463"
+    "test_create_sub_dataset_dot_no_path"
+    "test_cfg_passthrough"
+    "test_addurls_stdin_input_command_line"
+    "test_run_datalad_help"
+    "test_status_custom_summary_no_repeats"
+    "test_quoting"
+
+    #  No such file or directory: 'git-annex-remote-[...]"
+    "test_create"
+    "test_ensure_datalad_remote_maybe_enable"
+
+    # "git-annex: unable to use external special remote git-annex-remote-datalad"
+    "test_ria_postclonecfg"
+    "test_ria_postclone_noannex"
+    "test_ria_push"
+    "test_basic_scenario"
+    "test_annex_get_from_subdir"
+    "test_ensure_datalad_remote_init_and_enable_needed"
+    "test_ensure_datalad_remote_maybe_enable[False]"
+    "test_ensure_datalad_remote_maybe_enable[True]"
+    "test_create_simple"
+    "test_create_alias"
+    "test_storage_only"
+    "test_initremote"
+    "test_read_access"
+    "test_ephemeral"
+    "test_initremote_basic_fileurl"
+    "test_initremote_basic_httpurl"
+    "test_remote_layout"
+    "test_version_check"
+    "test_gitannex_local"
+    "test_push_url"
+    "test_url_keys"
+    "test_obtain_permission_root"
+    "test_source_candidate_subdataset"
+    "test_update_fetch_all"
+    "test_add_archive_dirs"
+    "test_add_archive_content"
+    "test_add_archive_content_strip_leading"
+    "test_add_archive_content_zip"
+    "test_add_archive_content_absolute_path"
+    "test_add_archive_use_archive_dir"
+    "test_add_archive_single_file"
+    "test_add_delete"
+    "test_add_archive_leading_dir"
+    "test_add_delete_after_and_drop"
+    "test_add_delete_after_and_drop_subdir"
+    "test_override_existing_under_git"
+    "test_copy_file_datalad_specialremote"
+    "test_download_url_archive"
+    "test_download_url_archive_from_subdir"
+    "test_download_url_archive_trailing_separator"
+    "test_download_url_need_datalad_remote"
+    "test_datalad_credential_helper - assert False"
+
+    # need internet access
+    "test_clone_crcns"
+    "test_clone_datasets_root"
+    "test_reckless"
+    "test_autoenabled_remote_msg"
+    "test_ria_http_storedataladorg"
+    "test_gin_cloning"
+    "test_nonuniform_adjusted_subdataset"
+    "test_install_datasets_root"
+    "test_install_simple_local"
+    "test_install_dataset_from_just_source"
+    "test_install_dataset_from_just_source_via_path"
+    "test_datasets_datalad_org"
+    "test_get_cached_dataset"
+    "test_cached_dataset"
+    "test_cached_url"
+    "test_anonymous_s3"
+    "test_protocols"
+    "test_get_versioned_url_anon"
+    "test_install_recursive_github"
+    "test_failed_install_multiple"
+
+    # pbcopy not found
+    "test_wtf"
+  ];
+
+  nativeCheckInputs = [
+    p7zip
+    python3.pkgs.pytestCheckHook
+    git-annex
+    curl
+    python3.pkgs.httpretty
+  ];
 
   pythonImportsCheck = [ "datalad" ];
 
-  meta = with lib; {
+  meta = {
     description = "Keep code, data, containers under control with git and git-annex";
     homepage = "https://www.datalad.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [ renesat ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ renesat ];
   };
 }
diff --git a/pkgs/applications/version-management/git-remote-hg/default.nix b/pkgs/applications/version-management/git-remote-hg/default.nix
index 57741a076385c..76f40911f0763 100644
--- a/pkgs/applications/version-management/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-remote-hg/default.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/mnauw/git-remote-hg";
     description = "Semi-official Mercurial bridge from Git project";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix
index 5397688ebf1fa..20335e2003a73 100644
--- a/pkgs/applications/version-management/gitlab-triage/default.nix
+++ b/pkgs/applications/version-management/gitlab-triage/default.nix
@@ -11,7 +11,7 @@ bundlerApp {
     description = "GitLab's issues and merge requests triage, automated!";
     homepage = "https://gitlab.com/gitlab-org/gitlab-triage";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gitlab-triage";
   };
 }
diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix
index 6fa79e69260a5..2a7cb13d2aa47 100644
--- a/pkgs/applications/version-management/gittyup/default.nix
+++ b/pkgs/applications/version-management/gittyup/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     description = "Graphical Git client designed to help you understand and manage your source code history";
     homepage = "https://murmele.github.io/Gittyup";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     broken = stdenv.isDarwin;
   };
diff --git a/pkgs/applications/version-management/gitweb/default.nix b/pkgs/applications/version-management/gitweb/default.nix
index 2c8d7eedc2d90..f2cb91ac4f838 100644
--- a/pkgs/applications/version-management/gitweb/default.nix
+++ b/pkgs/applications/version-management/gitweb/default.nix
@@ -22,6 +22,6 @@ in buildEnv {
        ++ [ "${git}/share/gitweb" ];
 
   meta = git.meta // {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/version-management/gut/default.nix b/pkgs/applications/version-management/gut/default.nix
index a6604e24fb345..0192fc3df937d 100644
--- a/pkgs/applications/version-management/gut/default.nix
+++ b/pkgs/applications/version-management/gut/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
     description = "Alternative git CLI";
     homepage = "https://gut-cli.dev";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gut";
   };
 }
diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix
index 9155f7398c8ae..f2ca2210f427b 100644
--- a/pkgs/applications/version-management/lab/default.nix
+++ b/pkgs/applications/version-management/lab/default.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
     homepage = "https://zaquestion.github.io/lab";
     license = licenses.cc0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lab";
   };
 }
diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix
index 5d5c8336987b8..98846c445dbf5 100644
--- a/pkgs/applications/version-management/ungit/default.nix
+++ b/pkgs/applications/version-management/ungit/default.nix
@@ -27,6 +27,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/FredrikNoren/ungit";
     license = lib.licenses.mit;
     mainProgram = "ungit";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index ff4968d7166de..d2ef35c9b6688 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       about the current working directory for various version control systems
     '';
     homepage    = "http://hg.gerg.ca/vcprompt";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = with platforms; linux ++ darwin;
     license = licenses.gpl2Plus;
     mainProgram = "vcprompt";
diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix
index 99323ef960516..bf8fa063bd92d 100644
--- a/pkgs/applications/video/anime-downloader/default.nix
+++ b/pkgs/applications/video/anime-downloader/default.nix
@@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Simple but powerful anime downloader and streamer";
     license = licenses.unlicense;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "anime";
   };
 }
diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
index 5b22b30e7682a..d8aa3e44b2c3a 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@@ -63,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
     description = "Tool to send media from online sources to Chromecast devices";
     homepage = "https://github.com/skorokithakis/catt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "catt";
   };
 }
diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
index 399287c93f7ff..3391210462c30 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     # during Linking C executable ccextractor
     broken = stdenv.isAarch64;
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ccextractor";
   };
 }
diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index 436f31ac5a01d..3d6b281ef07b3 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     mainProgram = "gnome-mplayer";
     homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer";
     license = licenses.gpl2;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix
index 44495386d4cf3..cade6f0c7484f 100644
--- a/pkgs/applications/video/go-chromecast/default.nix
+++ b/pkgs/applications/video/go-chromecast/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     homepage = "https://github.com/vishen/go-chromecast";
     description = "CLI for Google Chromecast, Home devices and Cast Groups";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "go-chromecast";
   };
 }
diff --git a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix
index 2cf5f8784dc1f..7644a71d71bc9 100644
--- a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix
+++ b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix
@@ -15,7 +15,7 @@ buildKodiAddon rec {
     homepage = "https://github.com/osmc/skin.osmc";
     description = "Default skin for OSMC";
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.cc-by-nc-sa-30;
 
     broken = true; # no release for kodi 21
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index ea2f0bde5e33c..c803e906e2d81 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,7 +1,30 @@
-{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSEnv
-, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
-, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid
-, alsa-lib, udev, libjack2, freetype, libva, libvdpau
+{
+  lib,
+  stdenv,
+  fetchurl,
+  dpkg,
+  makeWrapper,
+  buildFHSEnv,
+  gtk3,
+  gdk-pixbuf,
+  cairo,
+  libjpeg_original,
+  glib,
+  pango,
+  libGLU,
+  libGL,
+  nvidia_cg_toolkit,
+  zlib,
+  openssl,
+  libuuid,
+  alsa-lib,
+  udev,
+  libjack2,
+  freetype,
+  libva,
+  libvdpau,
+  twolame,
+  gmp,
 }:
 let
   fullPath = lib.makeLibraryPath [
@@ -24,20 +47,23 @@ let
     freetype
     libva
     libvdpau
+    twolame
+    gmp
   ];
 
   lightworks = stdenv.mkDerivation rec {
     version = "2023.2";
-    rev = "146240";
+    rev = "146752";
     pname = "lightworks";
 
     src =
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb";
-          sha256 = "sha256-sVEDCZZsY5OwuWebrhatzZiws89/tEKIdgY54PN0Ddo=";
+          sha256 = "sha256-Xjcqdhe85YdPX8AHpKmo/K77AURg0JvtqIvilQOV2ek=";
         }
-      else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
+      else
+        throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
 
     nativeBuildInputs = [ makeWrapper ];
     buildInputs = [ dpkg ];
@@ -76,13 +102,12 @@ let
     dontPatchELF = true;
   };
 
+in
 # Lightworks expects some files in /usr/share/lightworks
-in buildFHSEnv {
-  name = lightworks.name;
+buildFHSEnv {
+  inherit (lightworks) pname version;
 
-  targetPkgs = pkgs: [
-      lightworks
-  ];
+  targetPkgs = pkgs: [ lightworks ];
 
   runScript = "lightworks";
 
@@ -91,7 +116,12 @@ in buildFHSEnv {
     homepage = "https://www.lwks.com/";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ antonxy vojta001 kashw2 ];
+    mainProgram = "lightworks";
+    maintainers = with lib.maintainers; [
+      antonxy
+      vojta001
+      kashw2
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 19546092459d7..0f290f01459c8 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
     homepage = "https://flavio.tordini.org/minitube";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "minitube";
   };
 }
diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix
index 05c6799e4213b..e3f61cdd82018 100644
--- a/pkgs/applications/video/mlv-app/default.nix
+++ b/pkgs/applications/video/mlv-app/default.nix
@@ -54,7 +54,7 @@ mkDerivation rec {
     description = "All in one MLV processing app that is pretty great";
     homepage = "https://mlv.app";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "mlvapp";
   };
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index ec19f26e8a156..4415cd416e56e 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -68,6 +68,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/WarmUpTill/SceneSwitcher";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 85ee9c0e7ef8d..e278d4a158c81 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec {
       that can appeal to newbies and professionals alike.
     '';
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "pitivi";
   };
diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix
index b2eb371625cb1..6565a40975871 100644
--- a/pkgs/applications/video/rtabmap/default.nix
+++ b/pkgs/applications/video/rtabmap/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     description = "Real-Time Appearance-Based 3D Mapping";
     homepage = "https://introlab.github.io/rtabmap/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/applications/video/shaka-packager/default.nix b/pkgs/applications/video/shaka-packager/default.nix
index 0bb73ee50e762..039648963f752 100644
--- a/pkgs/applications/video/shaka-packager/default.nix
+++ b/pkgs/applications/video/shaka-packager/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://shaka-project.github.io/shaka-packager/html/";
     license = lib.licenses.bsd3;
     mainProgram = "packager";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = builtins.attrNames sources;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix
index b192edbffa0e9..aa00f5e8dce03 100644
--- a/pkgs/applications/video/subtitleedit/default.nix
+++ b/pkgs/applications/video/subtitleedit/default.nix
@@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix
index 2124813f417fd..7b7b1e0e7211c 100644
--- a/pkgs/applications/video/timelens/default.nix
+++ b/pkgs/applications/video/timelens/default.nix
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://timelens.blinry.org";
     changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "timelens";
   };
 }
diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index f4e2c8ee714fd..830c09bfa6d6c 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "wf-recorder";
   };
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
index 4e7252a514f88..71b22201e9dd9 100644
--- a/pkgs/applications/video/xscast/default.nix
+++ b/pkgs/applications/video/xscast/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/KeyboardFire/xscast";
     license = licenses.mit;
     description = "Screencasts of windows with list of keystrokes overlayed";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "xscast";
   };
 }
diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix
index 738271bf952e0..66ed0aa6b2839 100644
--- a/pkgs/applications/virtualization/ddev/default.nix
+++ b/pkgs/applications/virtualization/ddev/default.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     license = licenses.asl20;
     platforms = platforms.unix;
     mainProgram = "ddev";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 2b9d6e49451dd..20c390d58dc98 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -35,6 +35,6 @@ buildGoModule rec {
     mainProgram = "docker-compose";
     homepage = "https://github.com/docker/compose";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix
deleted file mode 100644
index ac5d726439ce1..0000000000000
--- a/pkgs/applications/virtualization/docker/compose_1.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, buildPythonApplication, fetchPypi
-, installShellFiles
-, mock, pytest, nose
-, pyyaml, colorama, docopt
-, dockerpty, docker, jsonschema, requests
-, six, texttable, websocket-client, cached-property
-, paramiko, distro, python-dotenv
-}:
-
-buildPythonApplication rec {
-  version = "1.29.2";
-  pname = "docker-compose";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc=";
-  };
-
-  # lots of networking and other fails
-  doCheck = false;
-  nativeBuildInputs = [ installShellFiles ];
-  nativeCheckInputs = [ mock pytest nose ];
-  propagatedBuildInputs = [
-    pyyaml colorama dockerpty docker
-    jsonschema requests six texttable websocket-client
-    docopt cached-property paramiko distro python-dotenv
-  ];
-
-  postPatch = ''
-    # Remove upper bound on requires, see also
-    # https://github.com/docker/compose/issues/4431
-    sed -i "s/, < .*',$/',/" setup.py
-  '';
-
-  postInstall = ''
-    installShellCompletion --bash contrib/completion/bash/docker-compose
-    installShellCompletion --zsh contrib/completion/zsh/_docker-compose
-  '';
-
-  meta = with lib; {
-    homepage = "https://docs.docker.com/compose/";
-    description = "Multi-container orchestration for Docker";
-    mainProgram = "docker-compose";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ Frostman ];
-  };
-}
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 946544a02a95f..b77d419e186fd 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -21,6 +21,7 @@ rec {
       , withBtrfs ? stdenv.isLinux, btrfs-progs
       , withLvm ? stdenv.isLinux, lvm2
       , withSeccomp ? stdenv.isLinux, libseccomp
+      , knownVulnerabilities ? []
     }:
   let
     docker-runc = runc.overrideAttrs {
@@ -267,6 +268,7 @@ rec {
       license = licenses.asl20;
       maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];
       mainProgram = "docker";
+      inherit knownVulnerabilities;
     };
   });
 
@@ -284,32 +286,38 @@ rec {
     containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
+    knownVulnerabilities = [
+      "CVE-2024-23651"
+      "CVE-2024-23652"
+      "CVE-2024-23653"
+      "CVE-2024-41110"
+    ];
   };
 
   docker_25 = callPackage dockerGen rec {
-    version = "25.0.5";
-    cliRev = "v${version}";
+    version = "25.0.6";
+    cliRev = "v25.0.5";
     cliHash = "sha256-CACMi3bXUN6oGc2f/Z+lNQqMgQ4llRWPRKgijdpiPGg=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-4QGz22fXxyAD77pyUWb2lF3VKqxmPIrGqcJGoyrEHew=";
+    mobyHash = "sha256-+zkhUMeVD3HNq8WrWQmLskq+HykvD5kzSACmf67YbJE=";
     runcRev = "v1.1.12";
     runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
-    containerdRev = "v1.7.13";
-    containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk=";
+    containerdRev = "v1.7.20";
+    containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };
 
   docker_26 = callPackage dockerGen rec {
-    version = "26.1.4";
+    version = "26.1.5";
     cliRev = "v${version}";
-    cliHash = "sha256-7yCR49Un1i1kB+66IKt/8lgwKNkUjtVh52DH9OY8Pw4=";
+    cliHash = "sha256-UlN+Uc0YHhLyu14h5oDBXP4K9y2tYKPOIPTGZCe4PVY=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-0WwlpUECvmNq6DBm7U7rjzYfGKF7pxsfs9+x5uVPV0k=";
+    mobyHash = "sha256-6Hx7GnA7P6HqDlnGoc+HpPHSl69XezwAEGbvWYUVQlE=";
     runcRev = "v1.1.12";
     runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
-    containerdRev = "v1.7.15";
-    containerdHash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU=";
+    containerdRev = "v1.7.18";
+    containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ=";
     tiniRev = "v0.19.0";
     tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
   };
diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix
index f5a1e13410b98..e0d833d0c2d50 100644
--- a/pkgs/applications/virtualization/qboot/default.nix
+++ b/pkgs/applications/virtualization/qboot/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     description = "Simple x86 firmware for booting Linux";
     homepage = "https://github.com/bonzini/qboot";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 840c9d648b941..1e400088693b3 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Run graphical applications with Docker";
     homepage = "https://github.com/mviereck/x11docker";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "x11docker";
   };
diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix
index 1c430649102c1..4a88518d508bb 100644
--- a/pkgs/applications/window-managers/i3/kitti3.nix
+++ b/pkgs/applications/window-managers/i3/kitti3.nix
@@ -36,6 +36,6 @@ buildPythonApplication rec {
     description = "Kitty drop-down service for sway & i3wm";
     mainProgram = "kitti3";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix
index b2a3adb98f907..df5bb41d85ecc 100644
--- a/pkgs/applications/window-managers/i3/layout-manager.nix
+++ b/pkgs/applications/window-managers/i3/layout-manager.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     mainProgram = "layout_manager";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix
index 6fb504144b6cf..8b0d3beb1c486 100644
--- a/pkgs/applications/window-managers/ion-3/default.nix
+++ b/pkgs/applications/window-managers/ion-3/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://modeemi.fi/~tuomov/ion";
     platforms = with platforms; linux;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix
index 4bcc48eb4d8f4..9108eec14c34d 100644
--- a/pkgs/applications/window-managers/tabbed/default.nix
+++ b/pkgs/applications/window-managers/tabbed/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://tools.suckless.org/tabbed";
     description = "Simple generic tabbed fronted to xembed aware applications";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 })
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index 7cba387369c7a..0560bb214ba2f 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/pkgs/applications/window-managers/vwm/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://vwm.sourceforge.net/";
     description = "Dynamic window manager for the console";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "vwm";
   };
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index e68dcdcd0e812..edeeaf5fbf654 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
     homepage    = "https://github.com/geommer/yabar";
     license     = licenses.mit;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "yabar";
   };
 }
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index ffd19cfd4a8a0..c00aff0b22886 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -51,7 +51,7 @@ let
   # list of packages which are for x86 (only multiPkgs, only for x86_64 hosts)
   multiPaths = multiPkgs pkgsi686Linux;
 
-  # base packages of the chroot
+  # base packages of the fhsenv
   # these match the host's architecture, glibc_multi is used for multilib
   # builds. glibcLocales must be before glibc or glibc_multi as otherwiese
   # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
@@ -84,7 +84,7 @@ let
   '';
 
   etcProfile = writeText "profile" ''
-    export PS1='${name}-chrootenv:\u@\h:\w\$ '
+    export PS1='${name}-fhsenv:\u@\h:\w\$ '
     export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
     export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
     export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
@@ -123,8 +123,8 @@ let
     ${profile}
   '';
 
-  # Compose /etc for the chroot environment
-  etcPkg = runCommandLocal "${name}-chrootenv-etc" { } ''
+  # Compose /etc for the fhs environment
+  etcPkg = runCommandLocal "${name}-fhs-etc" { } ''
     mkdir -p $out/etc
     pushd $out/etc
 
@@ -215,7 +215,7 @@ let
                  then setupLibDirsTarget
                  else setupLibDirsMulti;
 
-  # the target profile is the actual profile that will be used for the chroot
+  # the target profile is the actual profile that will be used for the fhs
   setupTargetProfile = ''
     mkdir -m0755 usr
     pushd usr
diff --git a/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
index 9d405c8a4917d..856d8e9ccdff0 100644
--- a/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
+++ b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Setup mount/user namespace for FHS emulation";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix
index cd5fa5f5937ef..487be834727f8 100644
--- a/pkgs/build-support/dev-shell-tools/default.nix
+++ b/pkgs/build-support/dev-shell-tools/default.nix
@@ -1,8 +1,13 @@
-{ lib }:
+{
+  lib,
+  writeTextFile,
+}:
 let
   inherit (builtins) typeOf;
 in
 rec {
+  # Docs: doc/build-helpers/dev-shell-tools.chapter.md
+  # Tests: ./tests/default.nix
   # This function closely mirrors what this Nix code does:
   # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102
   # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036
@@ -13,4 +18,48 @@ rec {
     if typeOf value == "path" then "${value}"
     else if typeOf value == "list" then toString (map valueToString value)
     else toString value;
+
+
+  # Docs: doc/build-helpers/dev-shell-tools.chapter.md
+  # Tests: ./tests/default.nix
+  # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004
+  unstructuredDerivationInputEnv = { drvAttrs }:
+    # FIXME: this should be `normalAttrs // passAsFileAttrs`
+    lib.mapAttrs'
+      (name: value:
+        let str = valueToString value;
+        in if lib.elem name (drvAttrs.passAsFile or [])
+        then
+          let
+            nameHash =
+              if builtins?convertHash
+              then builtins.convertHash {
+                hash = "sha256:" + builtins.hashString "sha256" name;
+                toHashFormat = "nix32";
+              }
+              else
+                builtins.hashString "sha256" name;
+            basename = ".attr-${nameHash}";
+          in
+            lib.nameValuePair "${name}Path" "${
+              writeTextFile {
+                name = "shell-passAsFile-${name}";
+                text = str;
+                destination = "/${basename}";
+              }
+            }/${basename}"
+        else lib.nameValuePair name str
+      )
+      (removeAttrs drvAttrs [
+        # TODO: there may be more of these
+        "args"
+      ]);
+
+  # Docs: doc/build-helpers/dev-shell-tools.chapter.md
+  # Tests: ./tests/default.nix
+  derivationOutputEnv = { outputList, outputMap }:
+    # A mapping from output name to the nix store path where they should end up
+    # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1253
+    lib.genAttrs outputList (output: builtins.unsafeDiscardStringContext outputMap.${output}.outPath);
+
 }
diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix
index bfedc04409a98..06ef7e393e324 100644
--- a/pkgs/build-support/dev-shell-tools/tests/default.nix
+++ b/pkgs/build-support/dev-shell-tools/tests/default.nix
@@ -4,11 +4,23 @@
   lib,
   stdenv,
   hello,
+  writeText,
+  zlib,
+  nixosTests,
 }:
 let
-  inherit (lib) escapeShellArg;
+  inherit (lib)
+    concatLines
+    escapeShellArg
+    isString
+    mapAttrsToList
+    ;
 in
-{
+lib.recurseIntoAttrs {
+
+  # nix-build -A tests.devShellTools.nixos
+  nixos = nixosTests.docker-tools-nix-shell;
+
   # nix-build -A tests.devShellTools.valueToString
   valueToString =
     let inherit (devShellTools) valueToString; in
@@ -42,4 +54,112 @@ in
         ) >log 2>&1 || { cat log; exit 1; }
       '';
     };
+
+  # nix-build -A tests.devShellTools.valueToString
+  unstructuredDerivationInputEnv =
+    let
+      inherit (devShellTools) unstructuredDerivationInputEnv;
+
+      drvAttrs = {
+        one = 1;
+        boolTrue = true;
+        boolFalse = false;
+        foo = "foo";
+        list = [ 1 2 3 ];
+        pathDefaultNix = ./default.nix;
+        stringWithDep = "Exe: ${hello}/bin/hello";
+        aPackageAttrSet = hello;
+        anOutPath = hello.outPath;
+        anAnAlternateOutput = zlib.dev;
+        args = [ "args must not be added to the environment" "Nix doesn't do it." ];
+
+        passAsFile = [ "bar" ];
+        bar = ''
+          bar
+          ${writeText "qux" "yea"}
+        '';
+      };
+      result = unstructuredDerivationInputEnv { inherit drvAttrs; };
+    in
+    assert result // { barPath = "<check later>"; } == {
+      one = "1";
+      boolTrue = "1";
+      boolFalse = "";
+      foo = "foo";
+      list = "1 2 3";
+      pathDefaultNix = "${./default.nix}";
+      stringWithDep = "Exe: ${hello}/bin/hello";
+      aPackageAttrSet = "${hello}";
+      anOutPath = "${hello.outPath}";
+      anAnAlternateOutput = "${zlib.dev}";
+
+      passAsFile = "bar";
+      barPath = "<check later>";
+    };
+
+    # Not runCommand, because it alters `passAsFile`
+    stdenv.mkDerivation ({
+      name = "devShellTools-unstructuredDerivationInputEnv-built-tests";
+
+      exampleBarPathString =
+        assert isString result.barPath;
+        result.barPath;
+
+      dontUnpack = true;
+      dontBuild = true;
+      dontFixup = true;
+      doCheck = true;
+
+      installPhase = "touch $out";
+
+      checkPhase = ''
+        fail() {
+          echo "$@" >&2
+          exit 1
+        }
+        checkAttr() {
+          echo checking attribute $1...
+          if [[ "$2" != "$3" ]]; then
+            echo "expected: $3"
+            echo "actual: $2"
+            exit 1
+          fi
+        }
+        ${
+          concatLines
+            (mapAttrsToList
+              (name: value:
+                "checkAttr ${name} \"\$${name}\" ${escapeShellArg value}"
+              )
+              (removeAttrs
+                result
+                [
+                  "args"
+
+                  # Nix puts it in workdir, which is not a concept for
+                  # unstructuredDerivationInputEnv, so we have to put it in the
+                  # store instead. This means the full path won't match.
+                  "barPath"
+                ])
+            )
+        }
+        (
+          set -x
+
+          diff $exampleBarPathString $barPath
+
+          ${lib.optionalString (builtins?convertHash) ''
+            [[ "$(basename $exampleBarPathString)" = "$(basename $barPath)" ]]
+          ''}
+        )
+
+        ''${args:+fail "args should not be set by Nix. We don't expect it to and unstructuredDerivationInputEnv removes it."}
+        if [[ "''${builder:-x}" == x ]]; then
+          fail "builder should be set by Nix. We don't remove it in unstructuredDerivationInputEnv."
+        fi
+      '';
+    } // removeAttrs drvAttrs [
+      # This would break the derivation. Instead, we have a check in the derivation to make sure Nix doesn't set it.
+      "args"
+    ]);
 }
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 3c580fafe9748..8e7371728029a 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1115,6 +1115,8 @@ rec {
             preferLocalBuild = true;
             passthru = passthru // {
               inherit (conf) imageTag;
+              inherit conf;
+              inherit streamScript;
 
               # Distinguish tarballs and exes at the Nix level so functions that
               # take images can know in advance how the image is supposed to be used.
@@ -1129,26 +1131,18 @@ rec {
   );
 
   # This function streams a docker image that behaves like a nix-shell for a derivation
+  # Docs: doc/build-helpers/images/dockertools.section.md
+  # Tests: nixos/tests/docker-tools-nix-shell.nix
   streamNixShellImage =
-    { # The derivation whose environment this docker image should be based on
-      drv
-    , # Image Name
-      name ? drv.name + "-env"
-    , # Image tag, the Nix's output hash will be used if null
-      tag ? null
-    , # User id to run the container as. Defaults to 1000, because many
-      # binaries don't like to be run as root
-      uid ? 1000
-    , # Group id to run the container as, see also uid
-      gid ? 1000
-    , # The home directory of the user
-      homeDirectory ? "/build"
-    , # The path to the bash binary to use as the shell. See `NIX_BUILD_SHELL` in `man nix-shell`
-      shell ? bashInteractive + "/bin/bash"
-    , # Run this command in the environment of the derivation, in an interactive shell. See `--command` in `man nix-shell`
-      command ? null
-    , # Same as `command`, but runs the command in a non-interactive shell instead. See `--run` in `man nix-shell`
-      run ? null
+    { drv
+    , name ? drv.name + "-env"
+    , tag ? null
+    , uid ? 1000
+    , gid ? 1000
+    , homeDirectory ? "/build"
+    , shell ? bashInteractive + "/bin/bash"
+    , command ? null
+    , run ? null
     }:
       assert lib.assertMsg (! (drv.drvAttrs.__structuredAttrs or false))
         "streamNixShellImage: Does not work with the derivation ${drv.name} because it uses __structuredAttrs";
@@ -1190,16 +1184,9 @@ rec {
         # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465
         sandboxBuildDir = "/build";
 
-        # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004
-        drvEnv = lib.mapAttrs' (name: value:
-          let str = valueToString value;
-          in if lib.elem name (drv.drvAttrs.passAsFile or [])
-          then lib.nameValuePair "${name}Path" (writeText "pass-as-text-${name}" str)
-          else lib.nameValuePair name str
-        ) drv.drvAttrs //
-          # A mapping from output name to the nix store path where they should end up
-          # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1253
-          lib.genAttrs drv.outputs (output: builtins.unsafeDiscardStringContext drv.${output}.outPath);
+        drvEnv =
+          devShellTools.unstructuredDerivationInputEnv { inherit (drv) drvAttrs; }
+          // devShellTools.derivationOutputEnv { outputList = drv.outputs; outputMap = drv; };
 
         # Environment variables set in the image
         envVars = {
@@ -1291,6 +1278,8 @@ rec {
       };
 
   # Wrapper around streamNixShellImage to build an image from the result
+  # Docs: doc/build-helpers/images/dockertools.section.md
+  # Tests: nixos/tests/docker-tools-nix-shell.nix
   buildNixShellImage = { drv, compressor ? "gz", ... }@args:
     let
       stream = streamNixShellImage (builtins.removeAttrs args ["compressor"]);
diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py
index 98ec2358cef94..d3778625ccdf4 100644
--- a/pkgs/build-support/docker/stream_layered_image.py
+++ b/pkgs/build-support/docker/stream_layered_image.py
@@ -32,7 +32,7 @@
 [2]: https://github.com/moby/moby/blob/4fb59c20a4fb54f944fe170d0ff1d00eb4a24d6f/image/spec/v1.2.md#image-json-field-descriptions
 """  # noqa: E501
 
-
+import argparse
 import io
 import os
 import re
@@ -225,16 +225,13 @@ def add_layer_dir(tar, paths, store_dir, mtime, uid, gid, uname, gname):
     """
 
     invalid_paths = [i for i in paths if not i.startswith(store_dir)]
-    assert len(invalid_paths) == 0, \
-        f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}"
+    assert (
+        len(invalid_paths) == 0
+    ), f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}"
 
     # First, calculate the tarball checksum and the size.
     extract_checksum = ExtractChecksum()
-    archive_paths_to(
-        extract_checksum,
-        paths,
-        mtime, uid, gid, uname, gname
-    )
+    archive_paths_to(extract_checksum, paths, mtime, uid, gid, uname, gname)
     (checksum, size) = extract_checksum.extract()
 
     path = f"{checksum}/layer.tar"
@@ -245,12 +242,9 @@ def add_layer_dir(tar, paths, store_dir, mtime, uid, gid, uname, gname):
     # Then actually stream the contents to the outer tarball.
     read_fd, write_fd = os.pipe()
     with open(read_fd, "rb") as read, open(write_fd, "wb") as write:
+
         def producer():
-            archive_paths_to(
-                write,
-                paths,
-                mtime, uid, gid, uname, gname
-            )
+            archive_paths_to(write, paths, mtime, uid, gid, uname, gname)
             write.close()
 
         # Closing the write end of the fifo also closes the read end,
@@ -292,10 +286,7 @@ def add_customisation_layer(target_tar, customisation_layer, mtime):
         target_tar.addfile(tarinfo, f)
 
     return LayerInfo(
-      size=None,
-      checksum=checksum,
-      path=path,
-      paths=[customisation_layer]
+        size=None, checksum=checksum, path=path, paths=[customisation_layer]
     )
 
 
@@ -317,13 +308,44 @@ def add_bytes(tar, path, content, mtime):
 
 
 def main():
-    with open(sys.argv[1], "r") as f:
+    arg_parser = argparse.ArgumentParser(
+        description="""
+This script generates a Docker image from a set of store paths. Uses
+Docker Image Specification v1.2 as reference [1].
+
+[1]: https://github.com/moby/moby/blob/master/image/spec/v1.2.md
+    """
+    )
+    arg_parser.add_argument(
+        "conf",
+        type=str,
+        help="""
+        JSON file with the following properties and writes the
+        image as an uncompressed tarball to stdout:
+
+        * "architecture", "config", "os", "created", "repo_tag" correspond to
+        the fields with the same name on the image spec [2].
+        * "created" can be "now".
+        * "created" is also used as mtime for files added to the image.
+        * "uid", "gid", "uname", "gname" is the file ownership, for example,
+        0, 0, "root", "root".
+        * "store_layers" is a list of layers in ascending order, where each
+        layer is the list of store paths to include in that layer.
+    """,
+    )
+    arg_parser.add_argument(
+        "--repo_tag", "-t", type=str,
+        help="Override the RepoTags from the configuration"
+    )
+
+    args = arg_parser.parse_args()
+    with open(args.conf, "r") as f:
         conf = json.load(f)
 
     created = (
-      datetime.now(tz=timezone.utc)
-      if conf["created"] == "now"
-      else datetime.fromisoformat(conf["created"])
+        datetime.now(tz=timezone.utc)
+        if conf["created"] == "now"
+        else datetime.fromisoformat(conf["created"])
     )
     mtime = int(created.timestamp())
     uid = int(conf["uid"])
@@ -340,20 +362,28 @@ def main():
 
         start = len(layers) + 1
         for num, store_layer in enumerate(conf["store_layers"], start=start):
-            print("Creating layer", num, "from paths:", store_layer,
-                  file=sys.stderr)
-            info = add_layer_dir(tar, store_layer, store_dir,
-                                 mtime, uid, gid, uname, gname)
+            print(
+                "Creating layer",
+                num,
+                "from paths:",
+                store_layer,
+                file=sys.stderr,
+            )
+            info = add_layer_dir(
+                tar, store_layer, store_dir, mtime, uid, gid, uname, gname
+            )
             layers.append(info)
 
-        print("Creating layer", len(layers) + 1, "with customisation...",
-              file=sys.stderr)
+        print(
+            "Creating layer",
+            len(layers) + 1,
+            "with customisation...",
+            file=sys.stderr,
+        )
         layers.append(
-          add_customisation_layer(
-            tar,
-            conf["customisation_layer"],
-            mtime=mtime
-          )
+            add_customisation_layer(
+                tar, conf["customisation_layer"], mtime=mtime
+            )
         )
 
         print("Adding manifests...", file=sys.stderr)
@@ -369,8 +399,8 @@ def main():
             },
             "history": [
                 {
-                  "created": datetime.isoformat(created),
-                  "comment": f"store paths: {layer.paths}"
+                    "created": datetime.isoformat(created),
+                    "comment": f"store paths: {layer.paths}",
                 }
                 for layer in layers
             ],
@@ -384,7 +414,7 @@ def main():
         manifest_json = [
             {
                 "Config": image_json_path,
-                "RepoTags": [conf["repo_tag"]],
+                "RepoTags": [args.repo_tag or conf["repo_tag"]],
                 "Layers": [layer.path for layer in layers],
             }
         ]
diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix
index 7372545eb56dd..857b11229cd87 100644
--- a/pkgs/by-name/_4/_4d-minesweeper/package.nix
+++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
     description = "4D Minesweeper game written in Godot";
     license = licenses.mpl20;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     mainProgram = "4d-minesweeper";
   };
 }
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index a36b27afe661a..882ded9b68809 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -71,7 +71,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Email client for your terminal";
     homepage = "https://aerc-mail.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "aerc";
     license = licenses.mit;
     platforms = platforms.unix;
diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix
index db3452e1be6a8..9519a5e706da9 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix
@@ -59,9 +59,9 @@
   };
   aks-preview = mkAzExtension rec {
     pname = "aks-preview";
-    version = "6.0.0b1";
+    version = "7.0.0b2";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl";
-    sha256 = "2e04cfef1cb404760006d73786c57259f8e5c92bc42b9eaca7314301ce0ba1a4";
+    sha256 = "f2f8aba2abf4252b3e77c2d4245320c025e111d5374bb6c1a57631cd72c42e39";
     description = "Provides a preview for upcoming AKS features";
   };
   akshybrid = mkAzExtension rec {
@@ -87,9 +87,9 @@
   };
   amg = mkAzExtension rec {
     pname = "amg";
-    version = "1.3.5";
+    version = "1.3.6";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl";
-    sha256 = "5eb4615d05dd85021d7d00311fdc25645535fe69e07cea1eca68d58cfb7bd44e";
+    sha256 = "52fbff96d56e381e636f6b2e9f8be80ac7eef766153ba8225a183b73d2972f25";
     description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension";
   };
   amlfs = mkAzExtension rec {
@@ -143,9 +143,9 @@
   };
   azure-firewall = mkAzExtension rec {
     pname = "azure-firewall";
-    version = "1.0.1";
+    version = "1.1.0";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-${version}-py2.py3-none-any.whl";
-    sha256 = "920023c55ae72d7e85baa43d81d96683be0e8348228b6f8e89e479fd4092c0f8";
+    sha256 = "562cc396c6afa1ef996c35b7bed801b3fd9677e4c6923f1148cb09255b24d1ef";
     description = "Manage Azure Firewall resources";
   };
   azurelargeinstance = mkAzExtension rec {
@@ -318,9 +318,9 @@
   };
   dataprotection = mkAzExtension rec {
     pname = "dataprotection";
-    version = "1.5.1";
+    version = "1.5.2";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-${version}-py3-none-any.whl";
-    sha256 = "2089e0c5ce213e0d79148cc2724c28679d93dc70a1e7290ee2ec99e5e0eed513";
+    sha256 = "534ba81cbfece53352e1862d4bfadc8a5b3fd0449178c482e13fc1925970dac3";
     description = "Microsoft Azure Command-Line Tools DataProtectionClient Extension";
   };
   datashare = mkAzExtension rec {
@@ -743,6 +743,13 @@
     sha256 = "1918817070ae9e0ceef57b93366d18b6e8bf577fd632e7da999e1e2abbb53656";
     description = "Microsoft Azure Command-Line Tools AzureMigrateV2 Extension";
   };
+  oracle-database = mkAzExtension rec {
+    pname = "oracle-database";
+    version = "1.0.0b1";
+    url = "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-${version}-py3-none-any.whl";
+    sha256 = "058c3de6c1e103ff0c62a188b1c606a35097a6652cb7eb6c3e5b77f77e15b5b1";
+    description = "Microsoft Azure Command-Line Tools OracleDatabase Extension";
+  };
   orbital = mkAzExtension rec {
     pname = "orbital";
     version = "0.1.0";
diff --git a/pkgs/by-name/ba/balls/lock.json b/pkgs/by-name/ba/balls/lock.json
new file mode 100644
index 0000000000000..5379ad56d2c4d
--- /dev/null
+++ b/pkgs/by-name/ba/balls/lock.json
@@ -0,0 +1,111 @@
+{
+  "depends": [
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/zjgvbd2l57kn33qnngr17qdqsinwqhzl-source",
+      "rev": "46ecdd598dbafeb0e0ba38e87e6bc98b4637cd13",
+      "sha256": "1rsl8z2gsa0pqh4wx8dvdjf94b0wn4bfbvcq9bfcvc7qkmn96mkg",
+      "url": "https://github.com/disruptek/ups/archive/46ecdd598dbafeb0e0ba38e87e6bc98b4637cd13.tar.gz",
+      "ref": "0.4.0",
+      "packages": [
+        "ups"
+      ],
+      "srcDir": ""
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/sh8prqisw6dmi91hbi7c4x934vvgy46p-source",
+      "rev": "64f71af2fa4572c2bdf8987a56a427c1d88fc34f",
+      "sha256": "1slqsl9gj782hlfzpklxwdy0hip6hhykrk226xzq31sg40nfh9r6",
+      "url": "https://github.com/haltcase/glob/archive/64f71af2fa4572c2bdf8987a56a427c1d88fc34f.tar.gz",
+      "packages": [
+        "glob"
+      ],
+      "srcDir": "src"
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/z211zbzrd1808rpr5j8lgfzc7rqwqpbr-source",
+      "rev": "358c8969183dcf365cbc34f9c9c035da0f8c60c7",
+      "sha256": "1x2rp0wj048hvbrj7xkdm408adj16rr8wg4wdfynxxryl08vl30l",
+      "url": "https://github.com/disruptek/insideout/archive/358c8969183dcf365cbc34f9c9c035da0f8c60c7.tar.gz",
+      "ref": "0.1.0",
+      "packages": [
+        "insideout"
+      ],
+      "srcDir": ""
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source",
+      "rev": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d",
+      "sha256": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg",
+      "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz",
+      "ref": "1.2.2",
+      "packages": [
+        "npeg"
+      ],
+      "srcDir": "src"
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/fclb7r25h7ldq4k8lrc9mc614nihyhp7-source",
+      "rev": "667736f52983239aa6b76a07605add23598362ca",
+      "sha256": "0y1a9p21hclrm2p3x018idrh4sk09hpr6csvcrnh5ka6baj6wj3k",
+      "url": "https://github.com/nim-works/cps/archive/667736f52983239aa6b76a07605add23598362ca.tar.gz",
+      "ref": "0.11.1",
+      "packages": [
+        "cps"
+      ],
+      "srcDir": ""
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/y6w1gzbf6i691z35rbn6kzrmf1n5bmdc-source",
+      "rev": "cb8b7bfdcdc2272aadf92153c668acd3c901bd6b",
+      "sha256": "1ggp5rvs217dv2n0p5ddm5h17pv2mc7724n8cd0b393kmsjiykhz",
+      "url": "https://github.com/nitely/nim-regex/archive/cb8b7bfdcdc2272aadf92153c668acd3c901bd6b.tar.gz",
+      "ref": "v0.25.0",
+      "packages": [
+        "regex"
+      ],
+      "srcDir": "src"
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/1mcck56sr1h1sf8gv87m761x6f3d1k0l-source",
+      "rev": "7c6ee4bfc184d7121896a098d68b639a96df7af1",
+      "sha256": "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq",
+      "url": "https://github.com/nitely/nim-unicodedb/archive/7c6ee4bfc184d7121896a098d68b639a96df7af1.tar.gz",
+      "ref": "v0.9.0",
+      "packages": [
+        "unicodedb"
+      ],
+      "srcDir": "src"
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/16fm03dql3pplz3ip40k0nbxw1gc0880-source",
+      "rev": "f5d50197b266173dd4ca4c6fdd30361398433bb4",
+      "sha256": "1cd3n9l45z60gpv0rc84v1ngkjxn0i45vz0lzy63052m7m0j2rks",
+      "url": "https://github.com/nitely/nim-unicodeplus/archive/f5d50197b266173dd4ca4c6fdd30361398433bb4.tar.gz",
+      "ref": "v0.9.1",
+      "packages": [
+        "unicodeplus"
+      ],
+      "srcDir": "src"
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/c4c1bbxd29gmjj543wma2sbya5wvw5yg-source",
+      "rev": "6845c68cf00c1546f49d628ae11334acba966bfb",
+      "sha256": "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh",
+      "url": "https://github.com/nitely/nim-segmentation/archive/6845c68cf00c1546f49d628ae11334acba966bfb.tar.gz",
+      "ref": "v0.1.0",
+      "packages": [
+        "segmentation"
+      ],
+      "srcDir": "src"
+    }
+  ]
+}
diff --git a/pkgs/by-name/ba/balls/package.nix b/pkgs/by-name/ba/balls/package.nix
new file mode 100644
index 0000000000000..04f6d701bb0f1
--- /dev/null
+++ b/pkgs/by-name/ba/balls/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildNimPackage,
+  fetchFromGitHub,
+  nim,
+  makeWrapper,
+}:
+
+buildNimPackage (finalAttrs: {
+  pname = "balls";
+  version = "5.4.0";
+
+  src = fetchFromGitHub {
+    owner = "disruptek";
+    repo = "balls";
+    rev = finalAttrs.version;
+    hash = "sha256-CMYkMkekVI0C1WUds+KBbRfjMte42kBAB2ddtQp8d+k=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  lockFile = ./lock.json;
+
+  postPatch =
+    # Trim comments from the Nimble file.
+    ''
+      sed \
+        -e 's/[[:space:]]* # .*$//g' \
+       -i balls.nimble
+    '';
+
+  preCheck = ''
+    echo 'path:"$projectDir/.."' > tests/nim.cfg
+  '';
+
+  postFixup =
+    let
+      lockAttrs = builtins.fromJSON (builtins.readFile finalAttrs.lockFile);
+      pathFlagOfFod = { path, srcDir, ... }: ''"--path:${path}/${srcDir}"'';
+      pathFlags = map pathFlagOfFod lockAttrs.depends;
+    in
+    ''
+      wrapProgram $out/bin/balls \
+        --suffix PATH : ${lib.makeBinPath [ nim ]} \
+        --append-flags '--path:"${finalAttrs.src}" ${toString pathFlags}'
+    '';
+
+  meta = finalAttrs.src.meta // {
+    description = "The testing framework with balls";
+    homepage = "https://github.com/disruptek/balls";
+    mainProgram = "balls";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix
index 6e85456b3adef..ce4c9b1d02225 100644
--- a/pkgs/by-name/be/bee/package.nix
+++ b/pkgs/by-name/be/bee/package.nix
@@ -51,6 +51,6 @@ buildGoModule rec {
       Bee is a Swarm node implementation, written in Go.
     '';
     license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix
new file mode 100644
index 0000000000000..17030eb6ccd98
--- /dev/null
+++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "bbctl";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "beeper";
+    repo = "bridge-manager";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xaBLI5Y7PxHbmlwD72AKNrgnz3D+3WVhb2GJr5cmyfs=";
+  };
+
+  vendorHash = "sha256-VnqihTEGfrLxRfuscrWWBbhZ/tr8BhVnCd+FKblW5gI=";
+
+  meta = {
+    description = "Tool for running self-hosted bridges with the Beeper Matrix server. ";
+    homepage = "https://github.com/beeper/bridge-manager";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.heywoodlh ];
+    mainProgram = "bbctl";
+    changelog = "https://github.com/beeper/bridge-manager/releases/tag/v{version}";
+  };
+}
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index b001e22adda6a..8338dd2335878 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -3,7 +3,7 @@
 , buildNpmPackage
 , nodejs_20
 , fetchFromGitHub
-, python311
+, python3
 , cctools
 , nixosTests
 , xcbuild
@@ -11,21 +11,21 @@
 
 buildNpmPackage rec {
   pname = "bitwarden-cli";
-  version = "2024.6.1";
+  version = "2024.7.1";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "cli-v${version}";
-    hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI=";
+    hash = "sha256-ZnqvqPR1Xuf6huhD5kWlnu4XOAWn7yte3qxgU/HPhiQ=";
   };
 
   nodejs = nodejs_20;
 
-  npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI=";
+  npmDepsHash = "sha256-lWlAc0ITSp7WwxM09umBo6qeRzjq4pJdC0RDUrZwcHY=";
 
   nativeBuildInputs = [
-    python311
+    (python3.withPackages (ps: with ps; [ setuptools ]))
   ] ++ lib.optionals stdenv.isDarwin [
     cctools
     xcbuild.xcrun
diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix
index d30ceb62d764a..4f912c09e6595 100644
--- a/pkgs/by-name/bp/bpftop/package.nix
+++ b/pkgs/by-name/bp/bpftop/package.nix
@@ -10,7 +10,7 @@
 }:
 let
   pname = "bpftop";
-  version = "0.5.1";
+  version = "0.5.2";
 in
 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
   inherit pname version;
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } {
     owner = "Netflix";
     repo = "bpftop";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CSQfg0JuWm0CFyC4eXxn7eSyKIu0gKAqgiQT64tgnDI=";
+    hash = "sha256-WH/oCnkBcvoouBbkAcyawfAuNR3VsTl5+ZATLpi9d4w=";
   };
 
-  cargoHash = "sha256-Hg763Zy5KRZqEDoasoDScZGAPb1ABRp+LI1c7IYJNf0=";
+  cargoHash = "sha256-H9HapuIyJJOSQIR9IvFZaQ+Nz9M0MH12JwbY8r2l+JY=";
 
   buildInputs = [
     elfutils
diff --git a/pkgs/by-name/bs/bsc/package.nix b/pkgs/by-name/bs/bsc/package.nix
new file mode 100644
index 0000000000000..48a1c8f994dea
--- /dev/null
+++ b/pkgs/by-name/bs/bsc/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  llvmPackages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bsc";
+  version = "3.3.4";
+
+  src = fetchFromGitHub {
+    owner = "IlyaGrebnov";
+    repo = "libbsc";
+    rev = "refs/tags/v${finalAttrs.version}";
+    sha256 = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q=";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp;
+
+  makeFlags = [
+    "CC=$(CXX)"
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with lib; {
+    description = "High performance block-sorting data compression library";
+    homepage = "http://libbsc.com/";
+    maintainers = with maintainers; [ sigmanificient ];
+    license = lib.licenses.asl20;
+    platforms = platforms.unix;
+    mainProgram = "bsc";
+  };
+})
diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix
index eeb20dbfda77a..42575689ea191 100644
--- a/pkgs/by-name/ca/cartridges/package.nix
+++ b/pkgs/by-name/ca/cartridges/package.nix
@@ -15,19 +15,16 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "cartridges";
-  version = "2.8.5";
+  version = "2.9.3";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "kra-mo";
     repo = "cartridges";
-    rev = "v${version}";
-    hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-37i8p6KaS/G7ybw850XYaPiG83/Lffn/+21xVk5xva0=";
   };
 
-  # TODO: remove this when #286814 hits master
-  mesonFlags = [ "-Dtiff_compression=jpeg" ];
-
   nativeBuildInputs = [
     appstream
     blueprint-compiler
@@ -54,6 +51,10 @@ python3Packages.buildPythonApplication rec {
   dontWrapGApps = true;
   makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ];
 
+  postFixup = ''
+    wrapPythonProgramsIn $out/libexec $out $pythonPath
+  '';
+
   meta = {
     description = "GTK4 + Libadwaita game launcher";
     longDescription = ''
diff --git a/pkgs/by-name/ce/cent/package.nix b/pkgs/by-name/ce/cent/package.nix
index 0436166a36dfb..065c666e0a1c2 100644
--- a/pkgs/by-name/ce/cent/package.nix
+++ b/pkgs/by-name/ce/cent/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/xm1k3/cent";
     changelog = "https://github.com/xm1k3/cent/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "cent";
   };
 }
diff --git a/pkgs/by-name/cl/cli11/package.nix b/pkgs/by-name/cl/cli11/package.nix
index d88470fa4d510..0e7146d8d7ce9 100644
--- a/pkgs/by-name/cl/cli11/package.nix
+++ b/pkgs/by-name/cl/cli11/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Command line parser for C++11";
     homepage = "https://github.com/CLIUtils/CLI11";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/cl/clzip/package.nix b/pkgs/by-name/cl/clzip/package.nix
index d2e17c5e14a04..8220d8b7bfa7c 100644
--- a/pkgs/by-name/cl/clzip/package.nix
+++ b/pkgs/by-name/cl/clzip/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "C language version of lzip";
     mainProgram = "clzip";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/co/coc-diagnostic/package.nix b/pkgs/by-name/co/coc-diagnostic/package.nix
new file mode 100644
index 0000000000000..6c67d2cb01497
--- /dev/null
+++ b/pkgs/by-name/co/coc-diagnostic/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  npmHooks,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation rec {
+  pname = "coc-diagnostic";
+  version = "0.24.1";
+
+  src = fetchFromGitHub {
+    owner = "iamcco";
+    repo = "coc-diagnostic";
+    # Upstream has no tagged versions
+    rev = "f4b8774bccf1c031da51f8ee52b05bc6b2337bf9";
+    hash = "sha256-+RPNFZ3OmdI9v0mY1VNJPMHs740IXvVJy4WYMgqqQSM=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    hash = "sha256-/WBOZKIIE2ERKuGwG+unXyam2JavPOuUeSIwZQ9RiHY=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+    npmHooks.npmInstallHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "diagnostic-languageserver extension for coc.nvim";
+    homepage = "https://github.com/iamcco/coc-diagnostic";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/by-name/cr/crabfit-api/package.nix b/pkgs/by-name/cr/crabfit-api/package.nix
index 43fa2947b87b0..27162f7ee24fa 100644
--- a/pkgs/by-name/cr/crabfit-api/package.nix
+++ b/pkgs/by-name/cr/crabfit-api/package.nix
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage {
     description = "Enter your availability to find a time that works for everyone";
     homepage = "https://github.com/GRA0007/crab.fit";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "crabfit-api";
   };
 }
diff --git a/pkgs/by-name/cr/crabfit-frontend/package.nix b/pkgs/by-name/cr/crabfit-frontend/package.nix
index 99d7be0fdeae1..920b39a5319f4 100644
--- a/pkgs/by-name/cr/crabfit-frontend/package.nix
+++ b/pkgs/by-name/cr/crabfit-frontend/package.nix
@@ -113,6 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Enter your availability to find a time that works for everyone";
     homepage = "https://github.com/GRA0007/crab.fit";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix
index 7ce48825da753..bf7d23c0b2b3f 100644
--- a/pkgs/by-name/cr/create-react-app/package.nix
+++ b/pkgs/by-name/cr/create-react-app/package.nix
@@ -28,6 +28,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/facebook/create-react-app";
     license = lib.licenses.mit;
     mainProgram = "create-react-app";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cu/cursewords/package.nix b/pkgs/by-name/cu/cursewords/package.nix
index 7a51705c1afea..d73705090e1d6 100644
--- a/pkgs/by-name/cu/cursewords/package.nix
+++ b/pkgs/by-name/cu/cursewords/package.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
     description = "Graphical command line program for solving crossword puzzles in the terminal";
     mainProgram = "cursewords";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index ea549fff71962..b55e7481e5598 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -1,11 +1,14 @@
-{ lib
-, fetchFromGitHub
-, dooit
-, python3
-, testers
-, nix-update-script
+{
+  lib,
+  fetchFromGitHub,
+  dooit,
+  python311,
+  testers,
+  nix-update-script,
 }:
-
+let
+  python3 = python311;
+in
 python3.pkgs.buildPythonApplication rec {
   pname = "dooit";
   version = "2.2.0";
@@ -18,9 +21,7 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  build-system = with python3.pkgs; [ poetry-core ];
 
   pythonRelaxDeps = [
     "textual"
@@ -53,7 +54,10 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/kraanzu/dooit";
     changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ khaneliman wesleyjrz ];
+    maintainers = with maintainers; [
+      khaneliman
+      wesleyjrz
+    ];
     mainProgram = "dooit";
   };
 }
diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix
index bff13f92f422a..1ed9382bef8f2 100644
--- a/pkgs/by-name/do/dorion/package.nix
+++ b/pkgs/by-name/do/dorion/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Tiny alternative Discord client";
     license = lib.licenses.gpl3Only;
     mainProgram = "dorion";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64);
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix
index 89defd092b0e4..9a82a2a20b578 100644
--- a/pkgs/by-name/dx/dxvk/package.nix
+++ b/pkgs/by-name/dx/dxvk/package.nix
@@ -70,7 +70,9 @@ stdenvNoCC.mkDerivation (
       done
     '';
 
-    passthru = { inherit dxvk32 dxvk64; };
+    passthru = {
+      inherit dxvk32 dxvk64;
+    };
 
     __structuredAttrs = true;
 
diff --git a/pkgs/by-name/dx/dxvk/setup_dxvk.sh b/pkgs/by-name/dx/dxvk/setup_dxvk.sh
index 27e5d6aa03d5a..529397ab2422e 100644
--- a/pkgs/by-name/dx/dxvk/setup_dxvk.sh
+++ b/pkgs/by-name/dx/dxvk/setup_dxvk.sh
@@ -12,6 +12,7 @@ set -eu -o pipefail
 ## Defaults
 
 declare -A dlls=(
+    [d3d8]="dxvk/d3d8.dll"
     [d3d9]="dxvk/d3d9.dll"
     [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll"
     [d3d11]="dxvk/d3d11.dll"
@@ -22,7 +23,7 @@ declare -A obsolete_dlls=(
     [mcfgthreads]="mcfgthreads/mcfgthread-12.dll"
 )
 
-declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1)
+declare -A targets=([d3d8]=1 [d3d9]=1 [d3d11]=1 [dxgi]=1)
 
 
 # Option variables
diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix
index 56be0cf7cd38e..d8a00086abb6b 100644
--- a/pkgs/by-name/dx/dxvk_2/package.nix
+++ b/pkgs/by-name/dx/dxvk_2/package.nix
@@ -6,38 +6,62 @@
   glslang,
   meson,
   ninja,
+  pkg-config,
   windows,
   spirv-headers,
   vulkan-headers,
   SDL2,
   glfw,
   gitUpdater,
-  sdl2Support ? true,
-  glfwSupport ? false,
+  sdl2Support ? (!stdenv.hostPlatform.isWindows),
+  glfwSupport ? (!stdenv.hostPlatform.isWindows),
 }:
 
-# SDL2 and GLFW support are mutually exclusive.
-assert !sdl2Support || !glfwSupport;
+assert stdenv.hostPlatform.isWindows -> !glfwSupport && !sdl2Support;
 
 let
-  isWindows = stdenv.hostPlatform.uname.system == "Windows";
+  inherit (stdenv) hostPlatform;
+
+  libPrefix = lib.optionalString (!hostPlatform.isWindows) "lib";
+  soVersion =
+    version:
+    if hostPlatform.isDarwin then
+      ".${version}${hostPlatform.extensions.sharedLibrary}"
+    else if hostPlatform.isWindows then
+      hostPlatform.extensions.sharedLibrary
+    else
+      "${hostPlatform.extensions.sharedLibrary}.${version}";
+
+  libglfw = "${libPrefix}glfw${soVersion "3"}";
+  libSDL2 = "${libPrefix}SDL2${lib.optionalString (!hostPlatform.isWindows) "-2.0"}${soVersion "0"}";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dxvk";
-  version = "2.3.1";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "doitsujin";
     repo = "dxvk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lUzD1NHFLO4UqOg/BUr7PnYMJCMr1KBh3VNx8etbt8c=";
+    hash = "sha256-4U0Z1oR0BKIHZ6YNT/+8sFe2I/ZKmPecInMXUho4MHg=";
     fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
   };
 
-  postPatch = ''
-    substituteInPlace "subprojects/libdisplay-info/tool/gen-search-table.py" \
-      --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"
-  '';
+  postPatch =
+    ''
+      substituteInPlace meson.build \
+        --replace-fail "dependency('glfw'" "dependency('glfw3'"
+      substituteInPlace subprojects/libdisplay-info/tool/gen-search-table.py \
+        --replace-fail "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3"
+    ''
+    + lib.optionalString glfwSupport ''
+      substituteInPlace src/wsi/glfw/wsi_platform_glfw.cpp \
+        --replace-fail '${libglfw}' '${lib.getLib glfw}/lib/${libglfw}'
+    ''
+    + lib.optionalString sdl2Support ''
+      substituteInPlace src/wsi/sdl2/wsi_platform_sdl2.cpp \
+        --replace-fail '${libSDL2}' '${lib.getLib SDL2}/lib/${libSDL2}'
+    '';
 
   strictDeps = true;
 
@@ -45,15 +69,16 @@ stdenv.mkDerivation (finalAttrs: {
     glslang
     meson
     ninja
-  ];
+  ] ++ lib.optionals (glfwSupport || sdl2Support) [ pkg-config ];
+
   buildInputs =
     [
       spirv-headers
       vulkan-headers
     ]
-    ++ lib.optionals (!isWindows && sdl2Support) [ SDL2 ]
-    ++ lib.optionals (!isWindows && glfwSupport) [ glfw ]
-    ++ lib.optionals isWindows [ windows.pthreads ];
+    ++ lib.optionals sdl2Support [ SDL2 ]
+    ++ lib.optionals glfwSupport [ glfw ]
+    ++ lib.optionals hostPlatform.isWindows [ windows.pthreads ];
 
   # Build with the Vulkan SDK in nixpkgs.
   preConfigure = ''
@@ -63,8 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonBuildType = "release";
 
-  mesonFlags = lib.optionals glfwSupport [ "-Ddxvk_native_wsi=glfw" ];
-
   doCheck = true;
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
@@ -72,11 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   meta = {
-    description = "Vulkan-based translation layer for Direct3D 9/10/11";
+    description = "Vulkan-based translation layer for Direct3D 8/9/10/11";
     homepage = "https://github.com/doitsujin/dxvk";
     changelog = "https://github.com/doitsujin/dxvk/releases";
     maintainers = [ lib.maintainers.reckenrode ];
     license = lib.licenses.zlib;
-    platforms = lib.platforms.windows ++ lib.platforms.linux;
+    badPlatforms = lib.platforms.darwin;
+    platforms = lib.platforms.windows ++ lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix
index 4d4e038f85f02..24f7b46496908 100644
--- a/pkgs/by-name/ea/ear2ctl/package.nix
+++ b/pkgs/by-name/ea/ear2ctl/package.nix
@@ -1,4 +1,11 @@
-{ lib, rustPlatform, fetchFromGitLab, pkg-config, dbus }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  pkg-config,
+  dbus,
+  nix-update-script,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "ear2ctl";
@@ -17,6 +24,8 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ dbus ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Linux controller for the Nothing Ear (2)";
     homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl";
diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix
index 62a3537cc5cd5..8be475d885fca 100644
--- a/pkgs/by-name/em/emulationstation/package.nix
+++ b/pkgs/by-name/em/emulationstation/package.nix
@@ -1,31 +1,33 @@
-{ lib
-, SDL2
-, alsa-lib
-, boost
-, cmake
-, curl
-, fetchFromGitHub
-, freeimage
-, freetype
-, libGL
-, libGLU
-, libvlc
-, pkg-config
-, rapidjson
-, stdenv
+{
+  lib,
+  SDL2,
+  alsa-lib,
+  boost,
+  callPackage,
+  cmake,
+  curl,
+  freeimage,
+  freetype,
+  libGL,
+  libGLU,
+  libvlc,
+  pkg-config,
+  rapidjson,
+  stdenv,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "emulationstation";
-  version = "2.11.2";
+let
+  sources = callPackage ./sources.nix { };
+in
+stdenv.mkDerivation {
+  inherit (sources.emulationstation) pname version src;
 
-  src = fetchFromGitHub {
-    owner = "RetroPie";
-    repo = "EmulationStation";
-    rev = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ=";
-  };
+  postUnpack = ''
+    pushd $sourceRoot/external/pugixml
+    cp --verbose --archive ${sources.pugixml.src}/* .
+    chmod --recursive 744 .
+    popd
+  '';
 
   nativeBuildInputs = [
     SDL2
@@ -46,11 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
   ];
 
-  strictDeps = true;
+  cmakeFlags = [ (lib.cmakeBool "GL" true) ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "GL" true)
-  ];
+  strictDeps = true;
 
   installPhase = ''
     runHook preInstall
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/share/emulationstation/
     cp -r ../resources $out/share/emulationstation/
 
-    runHook preInstall
+    runHook postInstall
   '';
 
   # es-core/src/resources/ResourceManager.cpp: resources are searched at the
@@ -70,12 +70,19 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
+  passthru = {
+    inherit sources;
+  };
+
   meta = {
     homepage = "https://github.com/RetroPie/EmulationStation";
     description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)";
     license = with lib.licenses; [ mit ];
     mainProgram = "emulationstation";
-    maintainers = with lib.maintainers; [ AndersonTorres edwtjo ];
+    maintainers = with lib.maintainers; [
+      AndersonTorres
+      edwtjo
+    ];
     platforms = lib.platforms.linux;
   };
-})
+}
diff --git a/pkgs/by-name/em/emulationstation/sources.nix b/pkgs/by-name/em/emulationstation/sources.nix
new file mode 100644
index 0000000000000..88273e845fee9
--- /dev/null
+++ b/pkgs/by-name/em/emulationstation/sources.nix
@@ -0,0 +1,35 @@
+{ fetchFromGitHub }:
+
+{
+  emulationstation =
+    let
+      self = {
+        pname = "emulationstation";
+        version = "2.11.2";
+
+        src = fetchFromGitHub {
+          owner = "RetroPie";
+          repo = "EmulationStation";
+          rev = "v${self.version}";
+          hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE=";
+        };
+      };
+    in
+    self;
+
+  pugixml =
+    let
+      self = {
+        pname = "pugixml";
+        version = "1.8.1";
+
+        src = fetchFromGitHub {
+          owner = "zeux";
+          repo = "pugixml";
+          rev = "v${self.version}";
+          hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4=";
+        };
+      };
+    in
+    self;
+}
diff --git a/pkgs/by-name/ex/ext4fuse/package.nix b/pkgs/by-name/ex/ext4fuse/package.nix
new file mode 100644
index 0000000000000..b083ec1c63f41
--- /dev/null
+++ b/pkgs/by-name/ex/ext4fuse/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fuse,
+  macfuse-stubs,
+  pkg-config,
+  which,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ext4fuse";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "gerard";
+    repo = "ext4fuse";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-bsFo+aaeNceSme9WBUVg4zpE4DzlmLHv+esQIAlTGGU=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    which
+  ];
+
+  buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm555 ext4fuse $out/bin/ext4fuse
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "EXT4 implementation for FUSE";
+    mainProgram = "ext4fuse";
+    homepage = "https://github.com/gerard/ext4fuse";
+    maintainers = with maintainers; [ felixalbrigtsen ];
+    platforms = platforms.unix;
+    license = licenses.gpl2Plus;
+  };
+})
diff --git a/pkgs/by-name/fa/fac/package.nix b/pkgs/by-name/fa/fac/package.nix
index 93aff4bec617c..ad26888ad5336 100644
--- a/pkgs/by-name/fa/fac/package.nix
+++ b/pkgs/by-name/fa/fac/package.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     homepage = "https://github.com/mkchoi212/fac";
     license = lib.licenses.mit;
     mainProgram = "fac";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix
new file mode 100644
index 0000000000000..fa17fdda10f01
--- /dev/null
+++ b/pkgs/by-name/fa/fava/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "fava";
+  version = "1.28";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-sWHVkR0/0VMGzH5OMxOCK4usf7G0odzMtr82ESRQhrk=";
+  };
+
+  postPatch = ''
+    substituteInPlace tests/test_cli.py \
+      --replace-fail '"fava"' '"${placeholder "out"}/bin/fava"'
+  '';
+
+  build-system = [ python3Packages.setuptools-scm ];
+
+  dependencies = with python3Packages; [
+    babel
+    beancount
+    cheroot
+    click
+    flask
+    flask-babel
+    jaraco-functools
+    jinja2
+    markdown2
+    ply
+    simplejson
+    werkzeug
+    watchfiles
+  ];
+
+  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
+
+  preCheck = ''
+    export HOME=$TEMPDIR
+  '';
+
+  meta = with lib; {
+    description = "Web interface for beancount";
+    mainProgram = "fava";
+    homepage = "https://beancount.github.io/fava";
+    changelog = "https://beancount.github.io/fava/changelog.html";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      bhipple
+      sigmanificient
+    ];
+  };
+}
diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix
index 6ecbeb9dd5ddc..10f150a3ccb6a 100644
--- a/pkgs/by-name/ff/ffsubsync/package.nix
+++ b/pkgs/by-name/ff/ffsubsync/package.nix
@@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/smacke/ffsubsync";
     description = "Automagically synchronize subtitles with video";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ffsubsync";
   };
 }
diff --git a/pkgs/by-name/fg/fgqcanvas/package.nix b/pkgs/by-name/fg/fgqcanvas/package.nix
index f64c4881d8236..ec47740232205 100644
--- a/pkgs/by-name/fg/fgqcanvas/package.nix
+++ b/pkgs/by-name/fg/fgqcanvas/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "Qt-based remote canvas application for FlightGear";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     mainProgram = "fgqcanvas";
   };
 }
diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 26ea275144a70..661c544776d24 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -45,6 +45,7 @@ python.pkgs.buildPythonApplication rec {
     jsonschema
     loguru
     psutil
+    pydantic
     pynzb
     pyrss2gen
     python-dateutil
diff --git a/pkgs/servers/geospatial/geoserver/data-dir.patch b/pkgs/by-name/ge/geoserver/data-dir.patch
similarity index 100%
rename from pkgs/servers/geospatial/geoserver/data-dir.patch
rename to pkgs/by-name/ge/geoserver/data-dir.patch
diff --git a/pkgs/servers/geospatial/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix
similarity index 53%
rename from pkgs/servers/geospatial/geoserver/extensions.nix
rename to pkgs/by-name/ge/geoserver/extensions.nix
index 654f84416c17b..5fbecd9da0704 100644
--- a/pkgs/servers/geospatial/geoserver/extensions.nix
+++ b/pkgs/by-name/ge/geoserver/extensions.nix
@@ -29,325 +29,325 @@ in
 {
   app-schema = mkGeoserverExtension {
     name = "app-schema";
-    version = "2.25.2"; # app-schema
-    hash = "sha256-qOBS6IfuXbTT9YHucAGedVfJ5xsVDTYP+9NLY5qaDWU="; # app-schema
+    version = "2.25.3"; # app-schema
+    hash = "sha256-IvcJAu62wXAh5OQkG3cTUB/X7dc/2q6Le7GSwfJL/sA="; # app-schema
   };
 
   authkey = mkGeoserverExtension {
     name = "authkey";
-    version = "2.25.2"; # authkey
-    hash = "sha256-GJSD3ULjDkxp3Ex6RSrafN6BXvglEbq9zNZZnEZYgL0="; # authkey
+    version = "2.25.3"; # authkey
+    hash = "sha256-4tEu9JOomMN/ntDHLqEwrn9lPrJ4LjTM/VuMsjARbF0="; # authkey
   };
 
   cas = mkGeoserverExtension {
     name = "cas";
-    version = "2.25.2"; # cas
-    hash = "sha256-vrYCPMVK9BQiGa7L25bzSGQuwA+kEf6BGS5Sv49N9bE="; # cas
+    version = "2.25.3"; # cas
+    hash = "sha256-Am8tgF5APKuTa7XI7aI9Oq9jAiDPfJhGCXErtyPpDS8="; # cas
   };
 
   charts = mkGeoserverExtension {
     name = "charts";
-    version = "2.25.2"; # charts
-    hash = "sha256-QXb3tzOabBejIGvys7DRj/zZPewcZjjJPCn99bvbpjM="; # charts
+    version = "2.25.3"; # charts
+    hash = "sha256-0Vu9ldBYWe4vFQ6ftEO/WsmNz3Sf3W8iPS7t9W/+5fY="; # charts
   };
 
   control-flow = mkGeoserverExtension {
     name = "control-flow";
-    version = "2.25.2"; # control-flow
-    hash = "sha256-JNOs103SMHzG2I46kXDKV3f6xfGpDhXpVY+jR4IDKFw="; # control-flow
+    version = "2.25.3"; # control-flow
+    hash = "sha256-zH+Hz7SySKRdrrmMBukXkaCziszIwOqzSmGYXWZGxs4="; # control-flow
   };
 
   css = mkGeoserverExtension {
     name = "css";
-    version = "2.25.2"; # css
-    hash = "sha256-lN1QfCCMVgVxVKmZRyQj6muFOCvoHHxNETOux8sZeMM="; # css
+    version = "2.25.3"; # css
+    hash = "sha256-c3VDxTGZebGCPfYhwUyENoGiDmVa1zttJEi/879RPsc="; # css
   };
 
   csw = mkGeoserverExtension {
     name = "csw";
-    version = "2.25.2"; # csw
-    hash = "sha256-rpAVzit0DSjgopL//nK0feejTSfnoTIyaKLz6vpajrs="; # csw
+    version = "2.25.3"; # csw
+    hash = "sha256-8G7GY5n0bV/xvwUkTijHLnsXBD4MczIastdeGmFcfSc="; # csw
   };
 
   csw-iso = mkGeoserverExtension {
     name = "csw-iso";
-    version = "2.25.2"; # csw-iso
-    hash = "sha256-nsieTEMrysZt9Jz3dWTvfCKh41DrkrJ1sTxk4Iv/kEY="; # csw-iso
+    version = "2.25.3"; # csw-iso
+    hash = "sha256-cSY981K9QiY3YJJR1zBCQArJESZO+80oIa/uj+qTsTM="; # csw-iso
   };
 
   db2 = mkGeoserverExtension {
     name = "db2";
-    version = "2.25.2"; # db2
-    hash = "sha256-9S1QafqRlCtM9N/mEehRbko5kNgjGe5BJen98ZcqOt8="; # db2
+    version = "2.25.3"; # db2
+    hash = "sha256-0eRiLoPIWv5Bddi9RxRkxAVMSolZCpv1kKEK7FkQrXs="; # db2
   };
 
   # Needs wps extension.
   dxf = mkGeoserverExtension {
     name = "dxf";
-    version = "2.25.2"; # dxf
-    hash = "sha256-FcXcJwEm1Z3M0OUuR1p/PGbvbQ0zf4v0ruL/765xD+E="; # dxf
+    version = "2.25.3"; # dxf
+    hash = "sha256-0i2F9343IhN6LZMdTj/dSP5k5QXd7Si/8ZWbxmkcdD4="; # dxf
   };
 
   excel = mkGeoserverExtension {
     name = "excel";
-    version = "2.25.2"; # excel
-    hash = "sha256-2QEG6u3luAgCFvC1GIQQX7KVNz7KSllx+XMiHUBzH3c="; # excel
+    version = "2.25.3"; # excel
+    hash = "sha256-N7OCXq1HRwV1poPImct7T9ZWdbWWYprSBMarGXx33OI="; # excel
   };
 
   feature-pregeneralized = mkGeoserverExtension {
     name = "feature-pregeneralized";
-    version = "2.25.2"; # feature-pregeneralized
-    hash = "sha256-ayOQ7ZJ0vBwMfJltPX+ajG9fpxDbn9a+s0W5gAJ2Na0="; # feature-pregeneralized
+    version = "2.25.3"; # feature-pregeneralized
+    hash = "sha256-R1jv7GPT3f7D18gQoWcLXqhtULtUvA3wEeXC2Q0+eQg="; # feature-pregeneralized
   };
 
   # Note: The extension name ("gdal") clashes with pkgs.gdal.
   gdal = mkGeoserverExtension {
     name = "gdal";
-    version = "2.25.2"; # gdal
+    version = "2.25.3"; # gdal
     buildInputs = [ pkgs.gdal ];
-    hash = "sha256-CUKqgc/kiNh/kMrvBXiVHrko4MiMexvY7W48NNXXooU="; # gdal
+    hash = "sha256-n6B/FHpul29MTYuBsg0XNfTTANBXw/cSEolzIabhHA8="; # gdal
   };
 
   # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box.
   #geofence = mkGeoserverExtension {
   #  name = "geofence";
-  #  version = "2.25.2"; # geofence
-  #  hash = "sha256-HtbLj5hiqjIJU3IIbcvCQgxlan8PLn/xW+0U2FMBrwE="; # geofence
+  #  version = "2.25.3"; # geofence
+  #  hash = "sha256-298rEz0JmFhXxfv0tpdsDOrFLyS7GcuFwp/tX/m+SyI="; # geofence
   #};
 
   #geofence-server = mkGeoserverExtension {
   #  name = "geofence-server";
-  #  version = "2.25.2"; # geofence-server
-  #  hash = "sha256-o8+9ePnCuWjB0u9QcgJ2sYSMb0+XslROJEZdDJPXg3k="; # geofence-server
+  #  version = "2.25.3"; # geofence-server
+  #  hash = "sha256-PHP6OmulBbUJ1Q7qliYXX6fAA2C8q4h4i7qCXJpVUCQ="; # geofence-server
   #};
 
   #geofence-wps = mkGeoserverExtension {
   #  name = "geofence-wps";
-  #  version = "2.25.2"; # geofence-wps
-  #  hash = "sha256-3VsSgE9crmnbMP9njAlZTMZ8hyBRm5JXTLjSET53lco="; # geofence-wps
+  #  version = "2.25.3"; # geofence-wps
+  #  hash = "sha256-vH7gQsjfAEcpcM+JVRfbw5sH4eJz+051FBrmoS7MyYo="; # geofence-wps
   #};
 
   geopkg-output = mkGeoserverExtension {
     name = "geopkg-output";
-    version = "2.25.2"; # geopkg-output
-    hash = "sha256-P8DllJYIEIGnzzJeGx+hWpik5Tpo6m+7Ip6QRTZ9Qcs="; # geopkg-output
+    version = "2.25.3"; # geopkg-output
+    hash = "sha256-frcNjS+phsyuRo4PlmcSUu2Ylp3kHA8OYm+WCBAU/UI="; # geopkg-output
   };
 
   grib = mkGeoserverExtension {
     name = "grib";
-    version = "2.25.2"; # grib
-    hash = "sha256-MByVrJB6WCxiY4/Ljpfx93Lg01/iixgsnp47C0/LmtE="; # grib
+    version = "2.25.3"; # grib
+    hash = "sha256-uQ7xe3sokrE89QTfTLynHSHE0W6LmiICO3XKkWKEJBU="; # grib
     buildInputs = [ netcdf ];
   };
 
   gwc-s3 = mkGeoserverExtension {
     name = "gwc-s3";
-    version = "2.25.2"; # gwc-s3
-    hash = "sha256-I38JVvWTc+ernyyIcYAa7vLK4LNbdNihab3wveCyoLM="; # gwc-s3
+    version = "2.25.3"; # gwc-s3
+    hash = "sha256-1cc3JywXaCCQUojnTVYmkq9Gz5Y1atBJmd0GDhyGAIE="; # gwc-s3
   };
 
   h2 = mkGeoserverExtension {
     name = "h2";
-    version = "2.25.2"; # h2
-    hash = "sha256-Pn3XNTnFn1HQa4V+9FGp4xRWYOKYo7F9TqnPKs7JeNI="; # h2
+    version = "2.25.3"; # h2
+    hash = "sha256-Cp/3qrjNSKztAaMrxPoZo2YfGBEezLQp6/ZGOehkixM="; # h2
   };
 
   iau = mkGeoserverExtension {
     name = "iau";
-    version = "2.25.2"; # iau
-    hash = "sha256-4PD5DsJgoXfOQ5lf4okx1dW4zRiHSi8geGrqH4axWew="; # iau
+    version = "2.25.3"; # iau
+    hash = "sha256-MV/XYF61rQjuOJSU6n0ADauFYJGF0cZk4lMSoHs9drg="; # iau
   };
 
   importer = mkGeoserverExtension {
     name = "importer";
-    version = "2.25.2"; # importer
-    hash = "sha256-o5BHWMu4C7O8VTZWo7LPTtGR47d0opLTf+dQMxTVZzk="; # importer
+    version = "2.25.3"; # importer
+    hash = "sha256-T6PGv3zfiwA8DE2XZ2CusaQ0vRGZ75mO4nxONsCQU+g="; # importer
   };
 
   inspire = mkGeoserverExtension {
     name = "inspire";
-    version = "2.25.2"; # inspire
-    hash = "sha256-iQlpq5ZP3Gz9UGXH1hSW7S5Zv1mZHqieTACUX0dP3Vs="; # inspire
+    version = "2.25.3"; # inspire
+    hash = "sha256-A4BBd0Q8NVjPLI6e8HTCg5zd4QOLQ6Ho3/2hnRXCeTM="; # inspire
   };
 
   # Needs Kakadu plugin from
   # https://github.com/geosolutions-it/imageio-ext
   #jp2k = mkGeoserverExtension {
   #  name = "jp2k";
-  #  version = "2.25.2"; # jp2k
-  #  hash = "sha256-0Sh0eM0ZWyCL34IOir7j3gYwyUU7y3+zhIV5y+BJ1NA="; # jp2k
+  #  version = "2.25.3"; # jp2k
+  #  hash = "sha256-0df5vPLYqxPAxqINwdWZ5RRJQVm/79sUcj8fB4RwMKY="; # jp2k
   #};
 
   libjpeg-turbo = mkGeoserverExtension {
     name = "libjpeg-turbo";
-    version = "2.25.2"; # libjpeg-turbo
-    hash = "sha256-hXjF7uifk8Tp3z2qLhymQOwIJ8Ml4FN5Qd4s1NP3TPk="; # libjpeg-turbo
+    version = "2.25.3"; # libjpeg-turbo
+    hash = "sha256-vQjeYuB6JY+bMlxRXZ7HqgS2hEtmEJJvowfwhWmYkY4="; # libjpeg-turbo
     buildInputs = [ libjpeg.out ];
   };
 
   mapml = mkGeoserverExtension {
     name = "mapml";
-    version = "2.25.2"; # mapml
-    hash = "sha256-fx8EpGg6ZeuGLuh+PLRNSWgH74MEnIvB4rXw6GVS+60="; # mapml
+    version = "2.25.3"; # mapml
+    hash = "sha256-3BMCWeAFn52Uiob53eer5OqBLOgQaMTmHPFTLs51mEg="; # mapml
   };
 
   mbstyle = mkGeoserverExtension {
     name = "mbstyle";
-    version = "2.25.2"; # mbstyle
-    hash = "sha256-uQw7wdkZP+1XUjombMxLnZ61DSl8NHyGoEuFy7biDlM="; # mbstyle
+    version = "2.25.3"; # mbstyle
+    hash = "sha256-SJAI4ssMZZL75gx1h7gwf+4YwXP/CNEm9BTtA/JNRW4="; # mbstyle
   };
 
   metadata = mkGeoserverExtension {
     name = "metadata";
-    version = "2.25.2"; # metadata
-    hash = "sha256-3TWMLToHwXn15T1d4v9U76WRjjIJhX12It5DPfuWdLY="; # metadata
+    version = "2.25.3"; # metadata
+    hash = "sha256-Gst1cctv/oKTS+jD0y8fHFrEBJyn77fEafV+QzspQVc="; # metadata
   };
 
   mongodb = mkGeoserverExtension {
     name = "mongodb";
-    version = "2.25.2"; # mongodb
-    hash = "sha256-Y/myutomkhAMPDjoGrsqEdsHjzI98+514vcKDIJPA2M="; # mongodb
+    version = "2.25.3"; # mongodb
+    hash = "sha256-LVejtipIRZy3g5GKs8RkOqKHNRskf8YSD11fiFvBF3w="; # mongodb
   };
 
   monitor = mkGeoserverExtension {
     name = "monitor";
-    version = "2.25.2"; # monitor
-    hash = "sha256-elDVdUT8DdxWGesF9MX+FSYs6thf3RHoUFJJvxGmb/A="; # monitor
+    version = "2.25.3"; # monitor
+    hash = "sha256-+FlKgoESE0j6JXM0yozYMyz6U2TshYNd6WHsKg9frAs="; # monitor
   };
 
   mysql = mkGeoserverExtension {
     name = "mysql";
-    version = "2.25.2"; # mysql
-    hash = "sha256-mers+ULFC1RSvC2aCs3qbcfmHbkLddriUaDr9wfJ/YA="; # mysql
+    version = "2.25.3"; # mysql
+    hash = "sha256-gfU67lID2YSNbi1aB8m1b+zGqtVnChi56HrtcBE6Aqw="; # mysql
   };
 
   netcdf = mkGeoserverExtension {
     name = "netcdf";
-    version = "2.25.2"; # netcdf
-    hash = "sha256-OJVqwGIhecDwmtmAaJcXbqlwCIASja5sUxBiPoXkrB0="; # netcdf
+    version = "2.25.3"; # netcdf
+    hash = "sha256-aMykYIBMwH46apDudKnApNba454Yep5HZeYPqEXoqcI="; # netcdf
     buildInputs = [ netcdf ];
   };
 
   netcdf-out = mkGeoserverExtension {
     name = "netcdf-out";
-    version = "2.25.2"; # netcdf-out
-    hash = "sha256-0Ym8oVA1wDFqQGaf0VspTX2tCTdI0yTsp7CAmenBL/8="; # netcdf-out
+    version = "2.25.3"; # netcdf-out
+    hash = "sha256-3gGzgC7IbwpettwSf4+b8HeJRuvkUfDu0xre9wyVap4="; # netcdf-out
     buildInputs = [ netcdf ];
   };
 
   ogr-wfs = mkGeoserverExtension {
     name = "ogr-wfs";
-    version = "2.25.2"; # ogr-wfs
+    version = "2.25.3"; # ogr-wfs
     buildInputs = [ pkgs.gdal ];
-    hash = "sha256-enrc+zGq2brreqQMbCjcnImf7aTZbLbuolK3/y1Icck="; # ogr-wfs
+    hash = "sha256-4rcUvN1py62JMQy51rxvNfV2AQIptXuRen7tvbrno6s="; # ogr-wfs
   };
 
   # Needs ogr-wfs extension.
   ogr-wps = mkGeoserverExtension {
     name = "ogr-wps";
-    version = "2.25.2"; # ogr-wps
+    version = "2.25.3"; # ogr-wps
     # buildInputs = [ pkgs.gdal ];
-    hash = "sha256-TCvydQYdtnqH/xudzBOyrvxqFqWke7B4At1f6L7UHO4="; # ogr-wps
+    hash = "sha256-RA1dxzjhOt7lQCu6SVSM8HiXYwtFbUfj0hdk831QE5g="; # ogr-wps
   };
 
   oracle = mkGeoserverExtension {
     name = "oracle";
-    version = "2.25.2"; # oracle
-    hash = "sha256-1KixJvCpeNc5lN+XSx+FC8D71WcnkO6mG3wYWH3w0c4="; # oracle
+    version = "2.25.3"; # oracle
+    hash = "sha256-fKJwLh4T445da1AWPzFpp++LGWiiKhN339VWt1N0s5Q="; # oracle
   };
 
   params-extractor = mkGeoserverExtension {
     name = "params-extractor";
-    version = "2.25.2"; # params-extractor
-    hash = "sha256-MzdJEvHOesJJnLs4fmWFgLjbjUBlc85tvWoHYv0gdjE="; # params-extractor
+    version = "2.25.3"; # params-extractor
+    hash = "sha256-zO9OwH7NCUILnxRqz1z/QJdfgsx9gfpf2R7rIsgTIr8="; # params-extractor
   };
 
   printing = mkGeoserverExtension {
     name = "printing";
-    version = "2.25.2"; # printing
-    hash = "sha256-JwyJYGIcZOaSvkFbJu9TAKVfwu3XwZP7dzewYx5HSsc="; # printing
+    version = "2.25.3"; # printing
+    hash = "sha256-QAy53/p+/mjCTXreKsVSRcpYgfAs7W9f+ZwE4Z6Gnx8="; # printing
   };
 
   pyramid = mkGeoserverExtension {
     name = "pyramid";
-    version = "2.25.2"; # pyramid
-    hash = "sha256-2LEat5BZgWFQmE68vxirXH+DIUEdVsTf6Ec8F+/6DA8="; # pyramid
+    version = "2.25.3"; # pyramid
+    hash = "sha256-kFTNQrxibatVZzPSC6Rv/SzU3FUJYQJ3dHZ5AfR3kD8="; # pyramid
   };
 
   querylayer = mkGeoserverExtension {
     name = "querylayer";
-    version = "2.25.2"; # querylayer
-    hash = "sha256-VnvfntM3SvMKxAk25Gj3iKqsYSKhLfh+PyyoANqwfq8="; # querylayer
+    version = "2.25.3"; # querylayer
+    hash = "sha256-TgQiroYcnVCe5QVIcEa8gsgYELqM2jS7RveGyetWokU="; # querylayer
   };
 
   sldservice = mkGeoserverExtension {
     name = "sldservice";
-    version = "2.25.2"; # sldservice
-    hash = "sha256-lzOs7MrmAqoJlCK+HxiKAOdlCHuqXa5DU9tilF6cZoo="; # sldservice
+    version = "2.25.3"; # sldservice
+    hash = "sha256-5E410iNaZVEBKzRGSBcW3JNISap2NrcFtXAuP1+cVt0="; # sldservice
   };
 
   sqlserver = mkGeoserverExtension {
     name = "sqlserver";
-    version = "2.25.2"; # sqlserver
-    hash = "sha256-EZTcoNfp1iGCBNW3YR4NZpeI+tStcodGE5wQiWfFzno="; # sqlserver
+    version = "2.25.3"; # sqlserver
+    hash = "sha256-TNeyegWOz/a7uFsn1hBhOgpV0vnFncwQ+U9VqyY62+g="; # sqlserver
   };
 
   vectortiles = mkGeoserverExtension {
     name = "vectortiles";
-    version = "2.25.2"; # vectortiles
-    hash = "sha256-+o8qliiCnRljCXniI+9I7ooU/l1SLEPF9iDtxviKfqY="; # vectortiles
+    version = "2.25.3"; # vectortiles
+    hash = "sha256-RQGeGhfixKrwRuzgmkZ/JDWaPZyDy8fAfGe0iXZfKdY="; # vectortiles
   };
 
   wcs2_0-eo = mkGeoserverExtension {
     name = "wcs2_0-eo";
-    version = "2.25.2"; # wcs2_0-eo
-    hash = "sha256-L9jKxivUtwA9Jgfy3E1rQD0+19PrvHxwklDJkAYFRT0="; # wcs2_0-eo
+    version = "2.25.3"; # wcs2_0-eo
+    hash = "sha256-+li0zBzyHaq0an7qHAdSXKDpvpOZProHnCoHXjyVY7Y="; # wcs2_0-eo
   };
 
   web-resource = mkGeoserverExtension {
     name = "web-resource";
-    version = "2.25.2"; # web-resource
-    hash = "sha256-KikKMMZ6vv/qWwn0TCQcNR18MbrJibweu+yvUhQt7vQ="; # web-resource
+    version = "2.25.3"; # web-resource
+    hash = "sha256-m9+t3Q2yD+xqvuBvkc5jYWwtGqJit00xiHyDSLX8euE="; # web-resource
   };
 
   wmts-multi-dimensional = mkGeoserverExtension {
     name = "wmts-multi-dimensional";
-    version = "2.25.2"; # wmts-multi-dimensional
-    hash = "sha256-J+buneos9vdfA8t9NS0IKo57ItorBN1IOmJvNHO/Qy0="; # wmts-multi-dimensional
+    version = "2.25.3"; # wmts-multi-dimensional
+    hash = "sha256-b/16463iotuADA/bIwTutYCiRZYusMf/yB1xEMPZe9U="; # wmts-multi-dimensional
   };
 
   wps = mkGeoserverExtension {
     name = "wps";
-    version = "2.25.2"; # wps
-    hash = "sha256-EqMx1aI/GR0nFvEMmo6RLXBZu8jJe+u2v+Muzf+ye9Q="; # wps
+    version = "2.25.3"; # wps
+    hash = "sha256-4WqZqfc80Qy3AACOb3MhDjocM02vKUEk9x8YfX5onyg="; # wps
   };
 
   # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not
   # available in nixpgs as of 2024/01.
   #wps-cluster-hazelcast = mkGeoserverExtension {
   #  name = "wps-cluster-hazelcast";
-  #  version = "2.25.2"; # wps-cluster-hazelcast
-  #  hash = "sha256-58BmwzdX3jGJHqvAjZjhIE5LxcLRZaUaeHmPrnN1PP8="; # wps-cluster-hazelcast
+  #  version = "2.25.3"; # wps-cluster-hazelcast
+  #  hash = "sha256-EDSSNVCZdcmv8ZfB3Gj80xm/ghlWNZwpTYhEwIoegM0="; # wps-cluster-hazelcast
   #};
 
   wps-download = mkGeoserverExtension {
     name = "wps-download";
-    version = "2.25.2"; # wps-download
-    hash = "sha256-qcqw875SIzsjXMJFMwIm9et6Vo0G0qg6zrZlgml8Ql8="; # wps-download
+    version = "2.25.3"; # wps-download
+    hash = "sha256-70vw5PHh1hLLAocFKlzPKDZWMjQmwUbv/L4yCJGrDQ4="; # wps-download
   };
 
   # Needs Postrgres configuration or similar.
   # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html
   wps-jdbc = mkGeoserverExtension {
     name = "wps-jdbc";
-    version = "2.25.2"; # wps-jdbc
-    hash = "sha256-MsR5/yeDbBgValx4gm9v8JNdFQnGBTdwy5nkOyUXTAs="; # wps-jdbc
+    version = "2.25.3"; # wps-jdbc
+    hash = "sha256-5d+txy1gw36G7hXfOf5qH+bSPIRw3XeLeMCTw6yHp/M="; # wps-jdbc
   };
 
   ysld = mkGeoserverExtension {
     name = "ysld";
-    version = "2.25.2"; # ysld
-    hash = "sha256-H8BfsRk6zk0kX94YY9yU8FeebTzjA8zagnVWU7Sr9/Q="; # ysld
+    version = "2.25.3"; # ysld
+    hash = "sha256-lbjfJPv9v4HUV31Hp5ZAEOe7IceRCxN7xtUxvOi2CYU="; # ysld
   };
 
 }
diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/by-name/ge/geoserver/package.nix
similarity index 96%
rename from pkgs/servers/geospatial/geoserver/default.nix
rename to pkgs/by-name/ge/geoserver/package.nix
index dca4c2af1ed91..e0b1f491aa157 100644
--- a/pkgs/servers/geospatial/geoserver/default.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "geoserver";
-  version = "2.25.2";
+  version = "2.25.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
-    sha256 = "sha256-tIXa1HECBTgJ1XiAo/hjo2AfbiyHyIsewfZu/k513iE=";
+    sha256 = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8=";
   };
 
   patches = [
diff --git a/pkgs/servers/geospatial/geoserver/update.sh b/pkgs/by-name/ge/geoserver/update.sh
similarity index 100%
rename from pkgs/servers/geospatial/geoserver/update.sh
rename to pkgs/by-name/ge/geoserver/update.sh
diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix
index 55ee9b79ea9df..b505e405e1733 100644
--- a/pkgs/by-name/gh/ghciwatch/package.nix
+++ b/pkgs/by-name/gh/ghciwatch/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ghciwatch";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "MercuryTechnologies";
     repo = "ghciwatch";
     rev = "v${version}";
-    hash = "sha256-SV2QRFXXXwWZGd2pe+7aK+p3X+EviDrykqceZ+24t4I=";
+    hash = "sha256-ywjbi+5xBrwgvgwAatNMs160ij52X8gbJ1PaLmZgTnY=";
   };
 
-  cargoHash = "sha256-/N1R8/qRIt0AiIzTKt/vPlSLxPdKU+oeuE4eZTjwJlA=";
+  cargoHash = "sha256-bE2cNgmq1TxtEDmLuyJVJpaj0Gbt73fnD1j/X42OL/w=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreFoundation
diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 98935dd0ba471..5b8b5b3f150b6 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitu";
-  version = "0.23.0";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
     rev = "v${version}";
-    hash = "sha256-ZAEIk81geW6oFMsfvlPWFRyd8tS5aIn2S/dsof6xDP0=";
+    hash = "sha256-PmZlK5pu5W+iiL0l1u1Z7YE0QABA6GqqetCXChdsf70=";
   };
 
-  cargoHash = "sha256-S3Z9UBQ64y2sHcPo8vzgUOKexeM+t7iyQDWjrAk1Kd4=";
+  cargoHash = "sha256-o+0bCzt/3G1UMewRJOgtjaD4NDHVDkSewD19rw3GCAI=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix
index 4261ebaec1efd..b470feab03f78 100644
--- a/pkgs/by-name/gn/gnome-pomodoro/package.nix
+++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
       This GNOME utility helps to manage time according to Pomodoro Technique.
       It intends to improve productivity and focus by taking short breaks.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 87ff8448d6262..7e3749e5db1d9 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -64,11 +64,11 @@ let
 
 in stdenv.mkDerivation (finalAttrs: {
   pname = "google-chrome";
-  version = "126.0.6478.182";
+  version = "127.0.6533.72";
 
   src = fetchurl {
     url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-izz3oEJAScI1MV3pBHLzwxCKs6M+rTORernvLv3sBYA=";
+    hash = "sha256-DpEYK/6SEaNfEa8uzGhXhALSSxt51X9X5ksaia8srJg=";
   };
 
   nativeBuildInputs = [ patchelf makeWrapper ];
@@ -157,6 +157,7 @@ in stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Freeware web browser developed by Google";
     homepage = "https://www.google.com/chrome/browser/";
+    changelog = "https://chromereleases.googleblog.com/";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [ jnsgruk johnrtitor ];
diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
index 26611fea9d658..c5797a9a15662 100644
--- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix
+++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
@@ -1,31 +1,40 @@
-{ lib
-, buildPackages
-, hare
-, runCommandNoCC
-, stdenv
-, writeText
+{
+  lib,
+  file,
+  hare,
+  runCommandNoCC,
+  writeText,
 }:
 let
-  inherit (stdenv.hostPlatform.uname) processor;
-  inherit (stdenv.hostPlatform) emulator;
+  archs = lib.concatStringsSep " " (
+    builtins.map (lib.removeSuffix "-linux") (
+      builtins.filter (lib.hasSuffix "-linux") hare.meta.platforms
+    )
+  );
   mainDotHare = writeText "main.ha" ''
-    use fmt;
-    use os;
-    export fn main() void = {
-        const machine = os::machine();
-        if (machine == "${processor}") {
-            fmt::println("os::machine() matches ${processor}")!;
-        } else {
-            fmt::fatalf("os::machine() does not match ${processor}: {}", machine);
-        };
-    };
+    export fn main() void = void;
   '';
 in
-runCommandNoCC "${hare.pname}-cross-compilation-test" { meta.timeout = 60; } ''
-  HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)"
-  export HARECACHE
-  outbin="test-${processor}"
-  ${lib.getExe hare} build -q -a "${processor}" -o "$outbin" ${mainDotHare}
-  ${emulator buildPackages} "./$outbin"
-  : 1>$out
-''
+runCommandNoCC "${hare.pname}-cross-compilation-test"
+  {
+    nativeBuildInputs = [
+      hare
+      file
+    ];
+  }
+  ''
+    HARECACHE="$(mktemp -d)"
+    export HARECACHE
+    readonly binprefix="bin"
+    for a in ${archs}; do
+      outbin="$binprefix-$a"
+      set -x
+      hare build -o "$outbin" -q -R -a "$a" ${mainDotHare}
+      set +x
+      printf -- 'Built "%s" target\n' "$a"
+    done
+
+    file -- "$binprefix-"*
+
+    : 1>$out
+  ''
diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
index 6090106f7b439..c809d73c3897a 100644
--- a/pkgs/by-name/ha/hare/package.nix
+++ b/pkgs/by-name/ha/hare/package.nix
@@ -161,7 +161,12 @@ stdenv.mkDerivation (finalAttrs: {
       }
       // lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
         mimeModule = callPackage ./mime-module-test.nix { hare = finalAttrs.finalPackage; };
-      };
+      }
+      //
+        lib.optionalAttrs (enableCrossCompilation && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+          {
+            crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; };
+          };
     # To be propagated by `hareHook`.
     inherit harec qbe;
   };
diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix
index 52e1b8a586b72..6e92eed1c65e9 100644
--- a/pkgs/by-name/hi/hidviz/package.nix
+++ b/pkgs/by-name/hi/hidviz/package.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "GUI application for in-depth analysis of USB HID class devices";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ht/http-server/package.nix b/pkgs/by-name/ht/http-server/package.nix
index 19e937f242e39..7c66a03e27279 100644
--- a/pkgs/by-name/ht/http-server/package.nix
+++ b/pkgs/by-name/ht/http-server/package.nix
@@ -33,6 +33,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/http-party/http-server";
     license = lib.licenses.mit;
     mainProgram = "http-server";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ia/ia-writer-quattro/package.nix b/pkgs/by-name/ia/ia-writer-quattro/package.nix
index 2f103f7cdbb7d..2a3cdd5feccdf 100644
--- a/pkgs/by-name/ia/ia-writer-quattro/package.nix
+++ b/pkgs/by-name/ia/ia-writer-quattro/package.nix
@@ -17,6 +17,7 @@ stdenvNoCC.mkDerivation {
 
     mkdir -p $out/share/fonts/truetype
     cp -R $src/iA\ Writer\ Quattro/Static/*.ttf $out/share/fonts/truetype
+    cp -R $src/iA\ Writer\ Quattro/Variable/*.ttf $out/share/fonts/truetype
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index da3a2b4e20fa4..a1b55f16899d8 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -1,35 +1,39 @@
-{ lib
-, stdenv
-, cmake
-, llvm
-, fetchFromGitHub
-, mbedtls
-, gtk3
-, pkg-config
-, capstone
-, dbus
-, libGLU
-, glfw3
-, file
-, perl
-, python3
-, jansson
-, curl
-, fmt_8
-, nlohmann_json
-, yara
-, rsync
+{
+  lib,
+  stdenv,
+  cmake,
+  llvm,
+  fetchFromGitHub,
+  mbedtls,
+  gtk3,
+  pkg-config,
+  capstone,
+  dbus,
+  libGLU,
+  libGL,
+  glfw3,
+  file,
+  perl,
+  python3,
+  jansson,
+  curl,
+  fmt_8,
+  nlohmann_json,
+  yara,
+  rsync,
+  autoPatchelfHook,
 }:
 
 let
-  version = "1.33.2";
-  patterns_version = "1.33.2";
+  version = "1.35.3";
+  patterns_version = "1.35.3";
 
   patterns_src = fetchFromGitHub {
+    name = "ImHex-Patterns-source-${patterns_version}";
     owner = "WerWolv";
     repo = "ImHex-Patterns";
     rev = "ImHex-v${patterns_version}";
-    hash = "sha256-5a6aFT8R8vMzPS+Y+fcDV5+olhioEpLjdMqa7qOyGsw=";
+    hash = "sha256-h86qoFMSP9ehsXJXOccUK9Mfqe+DVObfSRT4TCtK0rY=";
   };
 
 in
@@ -38,14 +42,23 @@ stdenv.mkDerivation rec {
   inherit version;
 
   src = fetchFromGitHub {
+    name = "ImHex-source-${version}";
     fetchSubmodules = true;
     owner = "WerWolv";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-8Ehpk0TjE4itQ7D9Nx74plYwABVufuYmxfxyuSqak1c=";
+    repo = "ImHex";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8vhOOHfg4D9B9yYgnGZBpcjAjuL4M4oHHax9ad5PJtA=";
   };
 
-  nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ];
+  nativeBuildInputs = [
+    autoPatchelfHook
+    cmake
+    llvm
+    python3
+    perl
+    pkg-config
+    rsync
+  ];
 
   buildInputs = [
     capstone
@@ -62,6 +75,14 @@ stdenv.mkDerivation rec {
     yara
   ];
 
+  # autoPatchelfHook only searches for *.so and *.so.*, and won't find *.hexpluglib
+  # however, we will append to RUNPATH ourselves
+  autoPatchelfIgnoreMissingDeps = [ "*.hexpluglib" ];
+  appendRunpaths = [
+    (lib.makeLibraryPath [ libGL ])
+    "${placeholder "out"}/lib/imhex/plugins"
+  ];
+
   cmakeFlags = [
     "-DIMHEX_OFFLINE_BUILD=ON"
     "-DUSE_SYSTEM_CAPSTONE=ON"
@@ -82,7 +103,10 @@ stdenv.mkDerivation rec {
     description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM";
     homepage = "https://github.com/WerWolv/ImHex";
     license = with licenses; [ gpl2Only ];
-    maintainers = with maintainers; [ kashw2 cafkafk ];
+    maintainers = with maintainers; [
+      kashw2
+      cafkafk
+    ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix
index 3f5aa2ea78f27..3a5b7b8492e15 100644
--- a/pkgs/by-name/ip/ipam/package.nix
+++ b/pkgs/by-name/ip/ipam/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     homepage = "https://ipam.lauka.net/";
     changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ipam";
   };
 }
diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix
index b0c37d1183246..8a5956e52a69b 100644
--- a/pkgs/by-name/ir/iredis/package.nix
+++ b/pkgs/by-name/ir/iredis/package.nix
@@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/laixintao/iredis/blob/${src.rev}/CHANGELOG.md";
     homepage = "https://iredis.xbin.io/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "iredis";
   };
 }
diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix
index 103484282276c..e8228113881fe 100644
--- a/pkgs/by-name/is/iscc/package.nix
+++ b/pkgs/by-name/is/iscc/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     homepage = "https://jrsoftware.org/isinfo.php";
     changelog = "https://jrsoftware.org/files/is6-whatsnew.htm";
     license = licenses.unfreeRedistributable;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = wineWow64Packages.stable.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 982f6fc91503b..d423d8e8b5685 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -29,7 +29,7 @@ appimageTools.wrapType2 {
     homepage = "https://github.com/janhq/jan";
     license = lib.licenses.agpl3Plus;
     mainProgram = "jan";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 8f23b6167e3dd..7d49b8dd4588c 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -22,7 +22,7 @@
   cublasSupport ? config.cudaSupport,
   # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
   # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60"
-  cudaArches ? cudaPackages.cudaFlags.arches or [ ],
+  cudaArches ? cudaPackages.cudaFlags.realArches or [ ],
 
   clblastSupport ? stdenv.isLinux,
   clblast,
@@ -40,7 +40,7 @@ let
   makeBool = option: bool: (if bool then "${option}=1" else "");
 
   libraryPathWrapperArgs = lib.optionalString config.cudaSupport ''
-    --prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}"
+    --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}"
   '';
 
   darwinFrameworks =
@@ -129,7 +129,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (makeBool "LLAMA_CLBLAST" clblastSupport)
     (makeBool "LLAMA_VULKAN" vulkanSupport)
     (makeBool "LLAMA_METAL" metalSupport)
-    (lib.optionals cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}")
+    (lib.optionals cublasSupport "CUDA_DOCKER_ARCH=${builtins.head cudaArches}")
   ];
 
   installPhase = ''
@@ -158,7 +158,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     wrapPythonProgramsIn "$out/bin" "$pythonPath"
     makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \
-      --prefix PATH ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs}
+      --prefix PATH : ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs}
   '';
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix
index d25c72f360821..cee0ba119b417 100644
--- a/pkgs/by-name/kt/ktls-utils/package.nix
+++ b/pkgs/by-name/kt/ktls-utils/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/oracle/ktls-utils";
     changelog = "https://github.com/oracle/ktls-utils/blob/${src.rev}/NEWS";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ktls-utils";
     platforms = platforms.linux;
   };
diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix
index fe83e66e7d42c..f7035840d813b 100644
--- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix
+++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "kyverno-chainsaw";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "chainsaw";
     rev = "v${version}";
-    hash = "sha256-UnLsy+htNG7DWU1Qw9HJZOPshq4L7YCtXSkh4jZe/XA=";
+    hash = "sha256-Ft3xWXUu57DHKTDyvtIvYExauP/La0xWu2rjbpcvxzM=";
   };
 
-  vendorHash = "sha256-UQCn5GKhhfHsHIOqYYVkKP76e2NTRtwjw2VvCwRPUB4=";
+  vendorHash = "sha256-ilQOf1GMVmf9FhwfMuK+eGFOnqmL+kW/ma+/KaTWqc4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index ee773bacf3a5b..2b00fdfb62dbd 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -170,7 +170,9 @@ stdenv.mkDerivation (finalAttrs: {
     cd "$NIX_BUILD_TOP/$sourceRoot"
 
     export NIX_CFLAGS_COMPILE+=" --ld-path=$out/bin/${targetPrefix}ld"
-    meson setup build-install-check -Db_lto=true --buildtype=$mesonBuildType
+    meson setup build-install-check -Db_lto=true --buildtype=$mesonBuildType${
+      lib.optionalString (targetPrefix != "") " -Dtarget_prefix=${targetPrefix}"
+    }
 
     cd build-install-check
     ninja ${targetPrefix}ld "-j$NIX_BUILD_CORES"
diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix
index d836b471cc8d2..18a73f2825de0 100644
--- a/pkgs/by-name/le/lexical/package.nix
+++ b/pkgs/by-name/le/lexical/package.nix
@@ -3,23 +3,26 @@
   beamPackages,
   fetchFromGitHub,
   elixir,
+  nix-update-script,
+  testers,
+  lexical,
 }:
 
 beamPackages.mixRelease rec {
   pname = "lexical";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "lexical-lsp";
     repo = "lexical";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gDiNjtYeEGoYoyoNmPh73EuYCvY36y9lUyLasbFrFgs=";
+    hash = "sha256-veIFr8oovEhukwkGzj02pdc6vN1FCXGz1kn4FAcMALQ=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     inherit pname version src;
 
-    hash = "sha256-xihxPfdLPr5jWFfcX2tccFUl7ND1mi9u8Dn28k6lGVA=";
+    hash = "sha256-pqghYSBeDHfeZclC7jQU0FbadioTZ6uT3+InEUSW3rY=";
   };
 
   installPhase = ''
@@ -36,11 +39,17 @@ beamPackages.mixRelease rec {
     makeWrapper "$out/libexec/start_lexical.sh" "$out/bin/lexical" --set RELEASE_COOKIE lexical
   '';
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion { package = lexical; };
+  };
+
+  meta = {
     description = "Lexical is a next-generation elixir language server";
     homepage = "https://github.com/lexical-lsp/lexical";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ GaetanLepage ];
+    changelog = "https://github.com/lexical-lsp/lexical/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "lexical";
     platforms = beamPackages.erlang.meta.platforms;
   };
diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix
index 8799750b94236..b5b0812d0188a 100644
--- a/pkgs/by-name/li/libui-ng/package.nix
+++ b/pkgs/by-name/li/libui-ng/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     description = "Portable GUI library for C";
     homepage = "https://github.com/libui-ng/libui-ng";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/ll/lldap-cli/package.nix b/pkgs/by-name/ll/lldap-cli/package.nix
new file mode 100644
index 0000000000000..6bec2c2426627
--- /dev/null
+++ b/pkgs/by-name/ll/lldap-cli/package.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, bash
+, coreutils
+, gnugrep
+, gnused
+, jq
+, curl
+, makeWrapper
+}:
+stdenv.mkDerivation {
+  pname = "lldap-cli";
+  version = "0-unstable-2024-02-24";
+
+  src = fetchFromGitHub {
+    owner = "Zepmann";
+    repo = "lldap-cli";
+    rev = "d1fe50006c4a3a1796d4fb2d73d8c8dcfc875fd5";
+    hash = "sha256-ZKRTYdgtOfV7TgpaVKLhYrCttYvB/bUexMshmmF8NyY=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  patchPhase = ''
+    runHook prePatch
+
+    # fix .lldap-cli-wrapped showing up in usage
+    substituteInPlace lldap-cli \
+      --replace-fail '$(basename $0)' lldap-cli
+
+    runHook postPatch
+  '';
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    install -Dm555 lldap-cli -t $out/bin
+    wrapProgram $out/bin/lldap-cli \
+      --prefix PATH : ${lib.makeBinPath [ bash coreutils gnugrep gnused jq curl ]}
+  '';
+
+  meta = {
+    description = "Command line tool for managing LLDAP";
+    longDescription = ''
+      LDAP-CLI is a command line interface for LLDAP.
+
+      LLDAP uses GraphQL to offer an HTTP-based API.
+      This API is used by an included web-based user interface.
+      Unfortunately, LLDAP lacks a command-line interface,
+      which is a necessity for any serious administrator.
+      LLDAP-CLI translates CLI commands to GraphQL API calls.
+    '';
+    homepage = "https://github.com/Zepmann/lldap-cli";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.nw ];
+    mainProgram = "lldap-cli";
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix
index f342da11610dd..283f09eae41a9 100644
--- a/pkgs/by-name/lo/logiops/package.nix
+++ b/pkgs/by-name/lo/logiops/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (oldAttrs: {
     mainProgram = "logid";
     homepage = "https://github.com/PixlOne/logiops";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 })
diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix
index b04e8d682e8ee..c62e3bf9e320d 100644
--- a/pkgs/by-name/lo/logiops_0_2_3/package.nix
+++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     mainProgram = "logid";
     homepage = "https://github.com/PixlOne/logiops";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index 793e305ac3a45..124c2d011716b 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -75,7 +75,7 @@ in {
     changelog = "https://github.com/logseq/logseq/releases/tag/${version}";
     license = lib.licenses.agpl3Plus;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "logseq";
   };
diff --git a/pkgs/by-name/lp/lprint/package.nix b/pkgs/by-name/lp/lprint/package.nix
index e45c8a0e30916..eb7353142c6c1 100644
--- a/pkgs/by-name/lp/lprint/package.nix
+++ b/pkgs/by-name/lp/lprint/package.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/michaelrsweet/lprint";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 1e75c0cefcb65..56b90a35fd7e7 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -3,6 +3,7 @@
   python3Packages,
   fetchFromGitHub,
   procps,
+  fetchpatch2,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "mackup";
@@ -16,26 +17,29 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-hAIl9nGFRaROlt764IZg4ejw+b1dpnYpiYq4CB9dJqQ=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "remove-six.patch";
+      url = "https://github.com/lra/mackup/commit/31ae717d40360e2e9d2d46518f57dcdc95b165ca.patch";
+      hash = "sha256-M2gtY03SOlPefsHREPmeajhnfmIoHbNYjm+W4YZqwKM=";
+      excludes = [ "CHANGELOG.md" ];
+    })
+  ];
+
   postPatch = ''
     substituteInPlace mackup/utils.py \
-      --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"'
+      --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \
   '';
 
-  nativeBuildInputs = with python3Packages; [
-    poetry-core
-    nose
-  ];
+  build-system = with python3Packages; [ poetry-core ];
 
-  propagatedBuildInputs = with python3Packages; [
-    six
-    docopt
-  ];
+  dependencies = with python3Packages; [ docopt ];
 
   pythonImportsCheck = [ "mackup" ];
 
-  checkPhase = ''
-    nosetests
-  '';
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "tests/*.py" ];
 
   meta = {
     description = "A tool to keep your application settings in sync (OS X/Linux)";
diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix
index 19844103ed854..aa6ba479010c3 100644
--- a/pkgs/by-name/ma/maven/package.nix
+++ b/pkgs/by-name/ma/maven/package.nix
@@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.asl20;
     mainProgram = "mvn";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     inherit (jdk_headless.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix
index 1dbca74813ecd..d80fce2cc6d27 100644
--- a/pkgs/by-name/md/mdbook-alerts/package.nix
+++ b/pkgs/by-name/md/mdbook-alerts/package.nix
@@ -7,7 +7,7 @@
   CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
 }:
 let
-  version = "0.6.0";
+  version = "0.6.1";
 in
 rustPlatform.buildRustPackage {
   pname = "mdbook-alerts";
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "lambdalisue";
     repo = "rs-mdbook-alerts";
     rev = "v${version}";
-    hash = "sha256-LKNEI4dPXQwa+7JqLXpFZeKaQSSS5DFdeGuxEGNgPCU=";
+    hash = "sha256-aCuufzCNKKUzyKS2/N2QokmO7e14TMfyd7yCjRsM0EE=";
   };
 
-  cargoHash = "sha256-oycBTCjC58cO9q+eeO1nFGZGKdp6Bilgs8aFHW/4gXs=";
+  cargoHash = "sha256-Nimkusc4Rautp+SxOsPq9txx9loIziSzQpG16mHQGb0=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index cb5093c2caf49..f05796e20ddce 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -178,7 +178,7 @@ python3.pkgs.buildPythonApplication rec {
       code.
     '';
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ AndersonTorres qyliss ];
     inherit (python3.meta) platforms;
   };
 }
diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index 50529dec4b772..dc7c362bc5a38 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.18.6";
+  version = "1.18.7";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-h/H5T9UBCp/gXM+c5muRs8luz3LoHofBGwP3jofQ9Qg=";
+    hash = "sha256-+9tVkMOOGwdmOXhoXanOpp8/7TEGGLR2aTeOsw+FzKc=";
   };
 
-  vendorHash = "sha256-lBHL4vD+0JDOlc6SWFsj0cerE/ypImoh8UFbL736SmA=";
+  vendorHash = "sha256-wbJgJY1EH3ajmoWXWRCSpD2C0eknajkwD1DaQz2EsUU=";
 
   excludedPackages = [ "./test" ];
 
diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix
new file mode 100644
index 0000000000000..e29deb34f9439
--- /dev/null
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@@ -0,0 +1,105 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gitUpdater,
+  nixosTests,
+  boost,
+  cmake,
+  glib,
+  glm,
+  gtest,
+  libevdev,
+  libglvnd,
+  libnotify,
+  libuuid,
+  libxkbcommon,
+  mesa,
+  mir,
+  nlohmann_json,
+  pcre2,
+  pkg-config,
+  yaml-cpp,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "miracle-wm";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "mattkae";
+    repo = "miracle-wm";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-Ss93yI33e+XFjbKedbBjmYHkjPeWUWxEStwNTgTszA4=";
+  };
+
+  postPatch =
+    ''
+      substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \
+        --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/miracle-wm' 'miracle-wm'
+    ''
+    + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'add_subdirectory(tests/)' ""
+    '';
+
+  strictDeps = true;
+
+  # Source has a path "session/usr/local/...", don't break references to that
+  dontFixCmake = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    glib
+    glm
+    libevdev
+    libglvnd
+    libnotify
+    libuuid
+    libxkbcommon
+    mesa # gbm.h
+    mir
+    nlohmann_json
+    pcre2
+    yaml-cpp
+  ];
+
+  checkInputs = [ gtest ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  checkPhase = ''
+    runHook preCheck
+
+    ./bin/miracle-wm-tests
+
+    runHook postCheck
+  '';
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+    providedSessions = [ "miracle-wm" ];
+    tests.vm = nixosTests.miracle-wm;
+  };
+
+  meta = with lib; {
+    description = "Tiling Wayland compositor based on Mir";
+    longDescription = ''
+      miracle-wm is a Wayland compositor based on Mir. It features a tiling window manager at its core, very much in
+      the style of i3 and sway. The intention is to build a compositor that is flashier and more feature-rich than
+      either of those compositors, like swayfx.
+
+      See the user guide for info on how to use miracle-wm: https://github.com/mattkae/miracle-wm/blob/v${finalAttrs.version}/USERGUIDE.md
+    '';
+    homepage = "https://github.com/mattkae/miracle-wm";
+    license = licenses.gpl3Only;
+    mainProgram = "miracle-wm";
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix
index c83c91e20e49e..b36b4cd59a432 100644
--- a/pkgs/by-name/mo/mommy/package.nix
+++ b/pkgs/by-name/mo/mommy/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/FWDekker/mommy/blob/v${version}/CHANGELOG.md";
     license = licenses.unlicense;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mommy";
   };
 }
diff --git a/pkgs/by-name/mo/mos/package.nix b/pkgs/by-name/mo/mos/package.nix
index 8cbca9f534451..a0065584800d1 100644
--- a/pkgs/by-name/mo/mos/package.nix
+++ b/pkgs/by-name/mo/mos/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "http://mos.caldis.me/";
     changelog = "https://github.com/Caldis/Mos/releases/tag/${finalAttrs.version}";
     license = licenses.cc-by-nc-40;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = platforms.darwin;
   };
diff --git a/pkgs/by-name/nb/nbmerge/package.nix b/pkgs/by-name/nb/nbmerge/package.nix
index b6dc642c96878..3cd2efb857caf 100644
--- a/pkgs/by-name/nb/nbmerge/package.nix
+++ b/pkgs/by-name/nb/nbmerge/package.nix
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
     description = "Tool to merge/concatenate Jupyter (IPython) notebooks";
     inherit (src.meta) homepage;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "nbmerge";
   };
 }
diff --git a/pkgs/by-name/nc/ncbi-vdb/package.nix b/pkgs/by-name/nc/ncbi-vdb/package.nix
new file mode 100644
index 0000000000000..64e981610cac7
--- /dev/null
+++ b/pkgs/by-name/nc/ncbi-vdb/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  bison,
+  cmake,
+  doxygen,
+  flex,
+  graphviz,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ncbi-vdb";
+  version = "3.1.1";
+
+  src = fetchFromGitHub {
+    owner = "ncbi";
+    repo = "ncbi-vdb";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-HBiheN8XfYYwmY5gw7j8qTczn6WZZNTzY2/fGtpgs/8=";
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    doxygen
+    flex
+    graphviz
+    python3
+  ];
+
+  meta = {
+    homepage = "https://github.com/ncbi/ncbi-vdb";
+    description = "Libraries for the INSDC Sequence Read Archives";
+    license = lib.licenses.ncbiPd;
+    maintainers = with lib.maintainers; [ t4ccer ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix
index 35f74f1b52cdd..447e46586eda3 100644
--- a/pkgs/by-name/ne/nerdfetch/package.nix
+++ b/pkgs/by-name/ne/nerdfetch/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nerdfetch";
-  version = "8.1.2";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "ThatOneCalculator";
     repo = "NerdFetch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hKs/Of6GIQ9Xtav7VfL+2DzMNpgUoDk5C/2lqldd/So=";
+    hash = "sha256-fSITel2WhlmKx+wMNKfur3zDqKYJs5+AZNJBd2MtGRw=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index dcacab7f55859..f8a6ecb8291a0 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -30,6 +30,6 @@ buildNpmPackage rec {
     description = "NetBird Management Service Web UI Panel";
     homepage = "https://github.com/netbirdio/dashboard";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix
index 44a6c5d8f4a98..b11fe8ee740eb 100644
--- a/pkgs/by-name/nf/nf-test/package.nix
+++ b/pkgs/by-name/nf/nf-test/package.nix
@@ -10,11 +10,11 @@
 stdenv.mkDerivation rec {
 
   pname = "nf-test";
-  version = "0.8.4";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "https://github.com/askimed/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-gCO75uNUKU+6UUST9CP4DnWGnl2vflH0y4CId/3IQ4E=";
+    hash = "sha256-PhI866NrbokMsSrU6YeSv03S1+VcNqVJsocI3xPfDcc=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/nh/nhentai/package.nix b/pkgs/by-name/nh/nhentai/package.nix
index e21c98bf58ea7..f6afd8d608829 100644
--- a/pkgs/by-name/nh/nhentai/package.nix
+++ b/pkgs/by-name/nh/nhentai/package.nix
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/RicterZ/nhentai";
     description = "CLI tool for downloading doujinshi from adult site(s)";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "nhentai";
   };
 }
diff --git a/pkgs/by-name/ob/obj-magic/package.nix b/pkgs/by-name/ob/obj-magic/package.nix
new file mode 100644
index 0000000000000..4f120323d0a32
--- /dev/null
+++ b/pkgs/by-name/ob/obj-magic/package.nix
@@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation {
+  pname = "obj-magic";
+  version = "0.5-unstable-2020-09-20";
+
+  src = fetchFromGitHub {
+    owner = "tapio";
+    repo = "obj-magic";
+    rev = "f25c9b78cee6529a3295ed314d1c200677dc56c0";
+    hash = "sha256-4A8TasyLOh6oz21/AwBbE5s3055EPftFh8mymrveTvY=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+    ./make.sh
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D obj-magic $out/bin/obj-magic
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Command line tool for manipulating Wavefront OBJ 3D meshes";
+    homepage = "https://github.com/tapio/obj-magic";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ lorenz ];
+    platforms = lib.platforms.unix;
+    mainProgram = "obj-magic";
+  };
+}
+
diff --git a/pkgs/by-name/oh/oh-my-fish/package.nix b/pkgs/by-name/oh/oh-my-fish/package.nix
index 60448748c320c..d18465609d919 100644
--- a/pkgs/by-name/oh/oh-my-fish/package.nix
+++ b/pkgs/by-name/oh/oh-my-fish/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
       easy to use.
     '';
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "omf-install";
     inherit (fish.meta) platforms;
   };
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 122d8fe23e158..4406d8985fbf4 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -40,13 +40,13 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-69CpRAggx6a1NJq+CA9QliXuUbDgC1ERRuA3y17KVAM=";
+    hash = "sha256-iD7LX4OstnNL2FZKObh4z9krkN0sfUUbFEZxu6OvdBs=";
     fetchSubmodules = true;
   };
 
@@ -60,11 +60,11 @@ let
     (preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=")
     (preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=")
     (preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=")
-    (preparePatch "05-default-pretokenizer.diff" "sha256-Mgx+xi59rz3d5yEXp90QPQMiUr9InlA0Wo1mOSuRcec=")
+    (preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=")
     (preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
     (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
     (preparePatch "08-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=")
-    (preparePatch "09-lora.diff" "sha256-HVDYiqNkuWO9K7aIiT73iiMj5lxMsJC1oqIG4madAPk=")
+    (preparePatch "09-lora.diff" "sha256-nyKqK/lKWU9HkOSV61Zfoj+25/IKbzPaLkQvAijWObY=")
   ];
 
   preparePatch =
diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix
index d3b352eec84e6..a554b6403dff8 100644
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvas-scanner";
-  version = "23.5.1";
+  version = "23.6.0";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jIPSQUdW+v0SV6sINkLujqZPysZSdaqHa5+sxTRdpH4=";
+    hash = "sha256-VIjkrlE39eq8a7Kgj4QZSZ5R9bAnw0oodUc8m/4bSCQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix
index f3aa96cbed149..03396d94b1a60 100644
--- a/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix
@@ -4,16 +4,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "parallel-disk-usage";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "KSXGitHub";
     repo = pname;
     rev = version;
-    hash = "sha256-nWn6T1vJ4UANuU5EL5Ws5qT+k8Wd3Cm0SOJEgAbsCvo=";
+    hash = "sha256-2w+A2ZpmLPBSj9odGh8QWAadE6e2XPJmBZwl6ZT6bSc=";
   };
 
-  cargoHash = "sha256-69DwIDGX4b+l2ay+OH3gjHnCj43VXruzBklOkS6M0DY=";
+  cargoHash = "sha256-WwWNAF0iKFZJ8anvXUJwXo8xw5pCNVO7RcAMyA1R4wE=";
 
   meta = with lib; {
     description = "Highly parallelized, blazing fast directory tree analyzer";
diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix
index b51dac8f237ae..855db7c079d60 100644
--- a/pkgs/by-name/pa/paratest/package.nix
+++ b/pkgs/by-name/pa/paratest/package.nix
@@ -23,6 +23,6 @@
     homepage = "https://github.com/paratestphp/paratest";
     license = lib.licenses.mit;
     mainProgram = "paratest";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix
index d7a57caa58fe0..5e1704cdeb78e 100644
--- a/pkgs/by-name/pe/pegtl/package.nix
+++ b/pkgs/by-name/pe/pegtl/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       for creating parsers according to a Parsing Expression Grammar (PEG).
     '';
     license = lib.licenses.boost;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix
index 6157da0d8a810..7431914a48eee 100644
--- a/pkgs/by-name/pe/pest/package.nix
+++ b/pkgs/by-name/pe/pest/package.nix
@@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: {
     homepage = "https://pestphp.com";
     license = lib.licenses.mit;
     mainProgram = "pest";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/pg/pgcopydb/package.nix b/pkgs/by-name/pg/pgcopydb/package.nix
index cc415c4d8a9d4..0df2ab9c04f74 100644
--- a/pkgs/by-name/pg/pgcopydb/package.nix
+++ b/pkgs/by-name/pg/pgcopydb/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/dimitri/pgcopydb";
     changelog = "https://github.com/dimitri/pgcopydb/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = licenses.postgresql;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pgcopydb";
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index 676ac95fb5129..8074e38cf5010 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     asciidoc
     docbook_xml_dtd_45
@@ -51,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    uthash
   ];
 
   buildInputs = [
@@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxslt
     pcre2
     pixman
+    uthash
     xcbutil
     xcbutilimage
     xcbutilrenderutil
diff --git a/pkgs/by-name/pi/pixi/Cargo.lock b/pkgs/by-name/pi/pixi/Cargo.lock
index 50e299718e769..caf8c8ea08df8 100644
--- a/pkgs/by-name/pi/pixi/Cargo.lock
+++ b/pkgs/by-name/pi/pixi/Cargo.lock
@@ -83,6 +83,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -153,6 +159,15 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "archspec"
 version = "0.1.3"
@@ -450,6 +465,14 @@ dependencies = [
  "backtrace",
 ]
 
+[[package]]
+name = "barrier_cell"
+version = "0.1.0"
+dependencies = [
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -676,7 +699,7 @@ dependencies = [
 [[package]]
 name = "cache-key"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "hex",
  "seahash",
@@ -780,9 +803,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -800,9 +823,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942"
 dependencies = [
  "anstream",
  "anstyle",
@@ -820,11 +843,21 @@ dependencies = [
  "clap",
 ]
 
+[[package]]
+name = "clap_complete_nushell"
+version = "4.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1accf1b463dee0d3ab2be72591dccdab8bef314958340447c882c4c72acfe2a3"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1029,6 +1062,20 @@ dependencies = [
  "parking_lot_core 0.9.10",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.10",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -1073,6 +1120,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "dialoguer"
 version = "0.11.0"
@@ -1127,10 +1185,21 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "distribution-filename"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "pep440_rs",
  "platform-tags",
@@ -1144,13 +1213,12 @@ dependencies = [
 [[package]]
 name = "distribution-types"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "cache-key",
  "distribution-filename",
  "fs-err",
- "indexmap 2.2.6",
  "itertools 0.13.0",
  "once_cell",
  "pep440_rs",
@@ -1359,13 +1427,24 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
+[[package]]
+name = "fd-lock"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
+dependencies = [
+ "cfg-if",
+ "rustix 0.38.34",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "file_url"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1042c5fdc9f2cf548a139ccd0985fa2460d796f99b08574f72f1f53d179e6591"
+checksum = "d0d1df57145d7cda57c95c44a2d64c24f579e2d50b8f4f7a779287293ad3adc0"
 dependencies = [
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "percent-encoding",
  "thiserror",
  "typed-path",
@@ -1400,6 +1479,24 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "fluent-uri"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1634,21 +1731,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "git2"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "libgit2-sys",
- "log",
- "openssl-probe",
- "openssl-sys",
- "url",
-]
-
 [[package]]
 name = "glob"
 version = "0.3.1"
@@ -1748,6 +1830,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "halfbrown"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f"
+dependencies = [
+ "hashbrown 0.14.5",
+ "serde",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1762,6 +1854,10 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.11",
+ "allocator-api2",
+]
 
 [[package]]
 name = "heck"
@@ -2215,7 +2311,7 @@ dependencies = [
 [[package]]
 name = "install-wheel-rs"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "configparser",
  "csv",
@@ -2231,7 +2327,7 @@ dependencies = [
  "pypi-types",
  "reflink-copy",
  "regex",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "serde",
  "serde_json",
  "sha2",
@@ -2241,7 +2337,7 @@ dependencies = [
  "uv-fs",
  "uv-normalize",
  "walkdir",
- "zip",
+ "zip 0.6.6",
 ]
 
 [[package]]
@@ -2338,15 +2434,27 @@ dependencies = [
 
 [[package]]
 name = "json-patch"
-version = "1.4.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
+checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
 dependencies = [
+ "jsonptr",
  "serde",
  "serde_json",
  "thiserror",
 ]
 
+[[package]]
+name = "jsonptr"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627"
+dependencies = [
+ "fluent-uri",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "jsonwebtoken"
 version = "9.3.0"
@@ -2416,25 +2524,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
-name = "libc"
-version = "0.2.155"
+name = "lexical-core"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+ "lexical-util",
+ "lexical-write-float",
+ "lexical-write-integer",
+]
 
 [[package]]
-name = "libgit2-sys"
-version = "0.16.2+1.7.2"
+name = "lexical-parse-float"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
 dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
 ]
 
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-integer"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
 [[package]]
 name = "libloading"
 version = "0.8.3"
@@ -2461,32 +2619,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "libssh2-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "line-wrap"
 version = "0.2.0"
@@ -2531,6 +2663,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.21"
@@ -2912,9 +3050,9 @@ dependencies = [
 [[package]]
 name = "once-map"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
- "dashmap",
+ "dashmap 5.5.3",
  "futures",
  "tokio",
 ]
@@ -2963,15 +3101,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-src"
-version = "300.3.0+3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.102"
@@ -2980,7 +3109,6 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -3151,7 +3279,7 @@ dependencies = [
 [[package]]
 name = "pep440_rs"
 version = "0.6.0"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "once_cell",
  "rkyv",
@@ -3163,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "pep508_rs"
 version = "0.6.0"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "derivative",
  "once_cell",
@@ -3282,16 +3410,18 @@ dependencies = [
 
 [[package]]
 name = "pixi"
-version = "0.24.2"
+version = "0.26.1"
 dependencies = [
  "ahash 0.8.11",
  "assert_matches",
  "async-once-cell",
+ "barrier_cell",
  "cfg-if",
  "chrono",
  "clap",
  "clap-verbosity-flag",
  "clap_complete",
+ "clap_complete_nushell",
  "concat-idents",
  "console",
  "crossbeam-channel",
@@ -3302,6 +3432,7 @@ dependencies = [
  "distribution-filename",
  "distribution-types",
  "dunce",
+ "fd-lock",
  "flate2",
  "fs_extra",
  "futures",
@@ -3374,13 +3505,13 @@ dependencies = [
  "uv-distribution",
  "uv-git",
  "uv-installer",
- "uv-interpreter",
  "uv-normalize",
  "uv-resolver",
+ "uv-toolchain",
  "uv-types",
  "winapi",
  "xxhash-rust",
- "zip",
+ "zip 0.6.6",
 ]
 
 [[package]]
@@ -3402,9 +3533,9 @@ dependencies = [
 [[package]]
 name = "platform-tags"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "serde",
  "thiserror",
 ]
@@ -3538,12 +3669,12 @@ dependencies = [
 [[package]]
 name = "pubgrub"
 version = "0.2.1"
-source = "git+https://github.com/astral-sh/pubgrub?rev=0e684a874c9fb8f74738cd8875524c80e3d4820b#0e684a874c9fb8f74738cd8875524c80e3d4820b"
+source = "git+https://github.com/astral-sh/pubgrub?rev=b4435e2f3af10dab2336a0345b35dcd622699d06#b4435e2f3af10dab2336a0345b35dcd622699d06"
 dependencies = [
  "indexmap 2.2.6",
  "log",
  "priority-queue",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "thiserror",
 ]
 
@@ -3565,11 +3696,11 @@ dependencies = [
 [[package]]
 name = "pypi-types"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "chrono",
- "git2",
  "indexmap 2.2.6",
+ "itertools 0.13.0",
  "mailparse",
  "once_cell",
  "pep440_rs",
@@ -3660,24 +3791,21 @@ dependencies = [
 
 [[package]]
 name = "rattler"
-version = "0.26.4"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d5504e8afc260cceebb79886032ac146c9344c55fbaf9034ca45a0c00b7447"
+checksum = "ba9b88912f9f10739d0e75f455d956129402c444b38a8c87538965d4f7495c1c"
 dependencies = [
  "anyhow",
- "bytes",
- "chrono",
  "clap",
  "console",
  "digest",
  "dirs",
  "fs-err",
  "futures",
- "fxhash",
  "humantime",
  "indexmap 2.2.6",
  "indicatif",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "memchr",
  "memmap2 0.9.4",
  "once_cell",
@@ -3697,7 +3825,6 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
- "tokio-stream",
  "tracing",
  "url",
  "uuid",
@@ -3705,16 +3832,15 @@ dependencies = [
 
 [[package]]
 name = "rattler_cache"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdad5b1a62c97fe6acbad6f1421eed77bf75f736a5af44a18f0e46d6d1cd5c81"
+checksum = "a2b48c3e9525109c28607b33eb47284d93415d443c14c594d868a99fe5612782"
 dependencies = [
  "anyhow",
- "chrono",
  "digest",
  "dirs",
  "fxhash",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "parking_lot 0.12.3",
  "rattler_conda_types",
  "rattler_digest",
@@ -3730,16 +3856,16 @@ dependencies = [
 
 [[package]]
 name = "rattler_conda_types"
-version = "0.25.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65d6d35c484af9b1a3ce13ace90de388c8a21b1f832bf2ee97b5681a94178326"
+checksum = "31342292e067dee0ce26b8c8827908ed24c340b28986a851c7f8a8440a4dfe48"
 dependencies = [
  "chrono",
  "file_url",
  "fxhash",
  "glob",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "lazy-regex",
  "nom",
  "purl",
@@ -3750,6 +3876,7 @@ dependencies = [
  "serde_json",
  "serde_repr",
  "serde_with",
+ "simd-json",
  "smallvec",
  "strum",
  "thiserror",
@@ -3760,9 +3887,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_digest"
-version = "0.19.4"
+version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf69475918dd44152f7df690b13f2909f34cc762ae18a2e2c55824b546de161"
+checksum = "eeb0228f734983274fb6938844123e88aa55158d53ead37e8ae3deb641fe05aa"
 dependencies = [
  "blake2",
  "digest",
@@ -3777,22 +3904,20 @@ dependencies = [
 
 [[package]]
 name = "rattler_lock"
-version = "0.22.12"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb54f27b97a03b9b2921bd18967947bc5788a8d653fcd6b6bdd18dad192312f"
+checksum = "785ed485e3dab9b6796d4d92adb8808e9b26e21a5ffa04e39530949ca85c68d9"
 dependencies = [
  "chrono",
  "file_url",
  "fxhash",
  "indexmap 2.2.6",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "pep440_rs",
  "pep508_rs",
- "purl",
  "rattler_conda_types",
  "rattler_digest",
  "serde",
- "serde_json",
  "serde_repr",
  "serde_with",
  "serde_yaml",
@@ -3802,9 +3927,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_macros"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10cef20e8356ea6840294e5754c6a8663b0eb1b97f29d517642f0f99215a2483"
+checksum = "b4961d74ca0a15a62c83e439dfd9f440f35f8c31dfb71afe990b2d8fbf916f7a"
 dependencies = [
  "quote",
  "syn 2.0.66",
@@ -3812,28 +3937,25 @@ dependencies = [
 
 [[package]]
 name = "rattler_networking"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c582ad6d82b397d1e1522910b34dc052bbed4dedc0eed7fb640024de0dc6f5f6"
+checksum = "0fec041e559f2b4cb21556816f10b3da174932f49280f335b21563d06d2a4737"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.22.1",
- "bytes",
  "chrono",
  "dirs",
  "fslock",
- "futures",
  "getrandom",
  "google-cloud-auth",
  "http 1.1.0",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "keyring",
  "netrc-rs",
- "pin-project-lite",
  "reqwest 0.12.4",
  "reqwest-middleware",
- "retry-policies",
+ "retry-policies 0.4.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -3843,9 +3965,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_package_streaming"
-version = "0.21.3"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390c453b80d7904362e121c89f29aee796fb4d38cc7b24fe7ba9e583ef77a27b"
+checksum = "1f6953df9956ee53d1569787742d26db5559f64bbaa06363260acc484bf00751"
 dependencies = [
  "bzip2",
  "chrono",
@@ -3863,15 +3985,15 @@ dependencies = [
  "tokio",
  "tokio-util",
  "url",
- "zip",
+ "zip 2.1.3",
  "zstd",
 ]
 
 [[package]]
 name = "rattler_repodata_gateway"
-version = "0.20.5"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810de4b4ef0c75087b77b6425caf869ee435ee392950f71800ec21ac512e576b"
+checksum = "d4ff7c7c1093f9268a98788e5dc54f278266c8c1422aaceb5fa92abbd5fb568d"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -3880,7 +4002,7 @@ dependencies = [
  "bytes",
  "cache_control",
  "chrono",
- "dashmap",
+ "dashmap 6.0.1",
  "dirs",
  "file_url",
  "futures",
@@ -3889,15 +4011,15 @@ dependencies = [
  "http-cache-semantics",
  "humansize",
  "humantime",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "json-patch",
  "libc",
  "md-5",
  "memmap2 0.9.4",
  "ouroboros",
  "parking_lot 0.12.3",
- "percent-encoding",
  "pin-project-lite",
+ "rattler_cache",
  "rattler_conda_types",
  "rattler_digest",
  "rattler_networking",
@@ -3921,13 +4043,13 @@ dependencies = [
 
 [[package]]
 name = "rattler_shell"
-version = "0.20.9"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17c8a64079dc3a7b8b0070e0d7c4bee4008bf16d799b8b621a9aa88968650c6"
+checksum = "ee99375f452b121ed0612da5ff8a4f56cc3706e0548dc36315d109b5d31d4a37"
 dependencies = [
  "enum_dispatch",
  "indexmap 2.2.6",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "rattler_conda_types",
  "serde_json",
  "shlex",
@@ -3939,16 +4061,17 @@ dependencies = [
 
 [[package]]
 name = "rattler_solve"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d62f673fe9f9198b4d3235da314d727eff59515cc4db9b0e2452e9bbe959433d"
+checksum = "46253b2995c30aa7ca38ae495a3cec45eb2d164697661f69687ae76dadd47cdd"
 dependencies = [
  "chrono",
  "futures",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "rattler_conda_types",
  "rattler_digest",
  "resolvo",
+ "serde",
  "tempfile",
  "thiserror",
  "tracing",
@@ -3957,9 +4080,9 @@ dependencies = [
 
 [[package]]
 name = "rattler_virtual_packages"
-version = "0.19.15"
+version = "0.19.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ae1f4c940a73181b636a2957e665f1c7caeed443ef468ca31d380417f4b52bd"
+checksum = "81e0d3f960081736895ec2ab3819dc4336e9160973ed47ce4a5ac1a3759422de"
 dependencies = [
  "archspec",
  "libloading",
@@ -4040,6 +4163,26 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "reflink-copy"
 version = "0.1.17"
@@ -4113,13 +4256,14 @@ dependencies = [
 [[package]]
 name = "requirements-txt"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "distribution-types",
  "fs-err",
  "pep508_rs",
  "pypi-types",
  "regex",
+ "thiserror",
  "tracing",
  "unscanny",
  "url",
@@ -4256,7 +4400,7 @@ dependencies = [
  "parking_lot 0.11.2",
  "reqwest 0.12.4",
  "reqwest-middleware",
- "retry-policies",
+ "retry-policies 0.3.0",
  "tokio",
  "tracing",
  "wasm-timer",
@@ -4264,9 +4408,9 @@ dependencies = [
 
 [[package]]
 name = "resolvo"
-version = "0.5.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b73dc355efbb88c372550b92bf17d36bf555ecf319a4783a5b8b7c34488bc5"
+checksum = "09f13bb82d6362074f2b2d858bb316dfb2a9940c7e33a9ccd0168ba4f6a247b2"
 dependencies = [
  "ahash 0.8.11",
  "bitvec",
@@ -4289,6 +4433,15 @@ dependencies = [
  "rand",
 ]
 
+[[package]]
+name = "retry-policies"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c"
+dependencies = [
+ "rand",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.8"
@@ -4405,6 +4558,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -4883,6 +5042,28 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simd-json"
+version = "0.13.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa"
+dependencies = [
+ "getrandom",
+ "halfbrown",
+ "lexical-core",
+ "ref-cast",
+ "serde",
+ "serde_json",
+ "simdutf8",
+ "value-trait",
+]
+
 [[package]]
 name = "simdutf8"
 version = "0.1.4"
@@ -5029,20 +5210,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -5196,6 +5377,12 @@ dependencies = [
  "xattr",
 ]
 
+[[package]]
+name = "target-lexicon"
+version = "0.12.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
+
 [[package]]
 name = "tempfile"
 version = "3.10.1"
@@ -5313,9 +5500,9 @@ checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5332,9 +5519,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5554,9 +5741,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typed-path"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6069e2cc1d241fd4ff5fa067e8882996fcfce20986d078696e05abccbcf27b43"
+checksum = "e8a3023f4683cd1a846dbd2666e8c34f54338ee5cebae578cda981a87cecd7aa"
 
 [[package]]
 name = "typeid"
@@ -5684,7 +5871,7 @@ dependencies = [
 [[package]]
 name = "uv-auth"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5705,7 +5892,7 @@ dependencies = [
 [[package]]
 name = "uv-build"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "distribution-types",
@@ -5717,7 +5904,7 @@ dependencies = [
  "pep508_rs",
  "pypi-types",
  "regex",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "serde",
  "serde_json",
  "tempfile",
@@ -5727,7 +5914,7 @@ dependencies = [
  "tracing",
  "uv-configuration",
  "uv-fs",
- "uv-interpreter",
+ "uv-toolchain",
  "uv-types",
  "uv-virtualenv",
 ]
@@ -5735,7 +5922,7 @@ dependencies = [
 [[package]]
 name = "uv-cache"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "cache-key",
  "directories",
@@ -5744,7 +5931,7 @@ dependencies = [
  "nanoid",
  "pypi-types",
  "rmp-serde",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "serde",
  "tempfile",
  "tracing",
@@ -5757,7 +5944,7 @@ dependencies = [
 [[package]]
 name = "uv-client"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5772,6 +5959,7 @@ dependencies = [
  "html-escape",
  "http 1.1.0",
  "install-wheel-rs",
+ "itertools 0.13.0",
  "pep440_rs",
  "pep508_rs",
  "platform-tags",
@@ -5784,7 +5972,6 @@ dependencies = [
  "serde",
  "serde_json",
  "sys-info",
- "tempfile",
  "thiserror",
  "tl",
  "tokio",
@@ -5804,13 +5991,13 @@ dependencies = [
 [[package]]
 name = "uv-configuration"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
- "distribution-types",
  "either",
  "pep508_rs",
  "platform-tags",
- "rustc-hash",
+ "pypi-types",
+ "rustc-hash 2.0.0",
  "serde",
  "serde_json",
  "tracing",
@@ -5821,40 +6008,44 @@ dependencies = [
 [[package]]
 name = "uv-dispatch"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "distribution-types",
  "futures",
  "install-wheel-rs",
  "itertools 0.13.0",
- "rustc-hash",
+ "pypi-types",
+ "rustc-hash 2.0.0",
  "tracing",
  "uv-build",
  "uv-cache",
  "uv-client",
  "uv-configuration",
  "uv-distribution",
+ "uv-git",
  "uv-installer",
- "uv-interpreter",
  "uv-resolver",
+ "uv-toolchain",
  "uv-types",
 ]
 
 [[package]]
 name = "uv-distribution"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
- "cache-key",
  "distribution-filename",
  "distribution-types",
+ "either",
  "fs-err",
  "futures",
+ "glob",
  "install-wheel-rs",
  "nanoid",
  "once_cell",
+ "path-absolutize",
  "pep440_rs",
  "pep508_rs",
  "platform-tags",
@@ -5862,12 +6053,14 @@ dependencies = [
  "reqwest 0.12.4",
  "reqwest-middleware",
  "rmp-serde",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "serde",
  "tempfile",
  "thiserror",
  "tokio",
  "tokio-util",
+ "toml",
+ "toml_edit 0.22.13",
  "tracing",
  "url",
  "uv-cache",
@@ -5878,13 +6071,14 @@ dependencies = [
  "uv-git",
  "uv-normalize",
  "uv-types",
- "zip",
+ "uv-warnings",
+ "zip 0.6.6",
 ]
 
 [[package]]
 name = "uv-extract"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "async-compression",
  "async_zip",
@@ -5893,20 +6087,20 @@ dependencies = [
  "md-5",
  "pypi-types",
  "rayon",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "sha2",
  "thiserror",
  "tokio",
  "tokio-tar",
  "tokio-util",
  "tracing",
- "zip",
+ "zip 0.6.6",
 ]
 
 [[package]]
 name = "uv-fs"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "backoff",
  "cachedir",
@@ -5928,20 +6122,16 @@ dependencies = [
 [[package]]
 name = "uv-git"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
- "base64 0.22.1",
  "cache-key",
  "cargo-util",
+ "dashmap 5.5.3",
  "fs-err",
- "git2",
- "glob",
- "hmac",
- "home",
- "rand",
  "reqwest 0.12.4",
- "sha1",
+ "reqwest-middleware",
+ "thiserror",
  "tokio",
  "tracing",
  "url",
@@ -5951,7 +6141,7 @@ dependencies = [
 [[package]]
 name = "uv-installer"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -5966,8 +6156,8 @@ dependencies = [
  "platform-tags",
  "pypi-types",
  "rayon",
- "requirements-txt",
- "rustc-hash",
+ "rustc-hash 2.0.0",
+ "same-file",
  "serde",
  "tempfile",
  "thiserror",
@@ -5981,57 +6171,17 @@ dependencies = [
  "uv-extract",
  "uv-fs",
  "uv-git",
- "uv-interpreter",
  "uv-normalize",
+ "uv-toolchain",
  "uv-types",
  "uv-warnings",
  "walkdir",
 ]
 
-[[package]]
-name = "uv-interpreter"
-version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
-dependencies = [
- "anyhow",
- "cache-key",
- "configparser",
- "fs-err",
- "futures",
- "install-wheel-rs",
- "itertools 0.13.0",
- "once_cell",
- "pep440_rs",
- "pep508_rs",
- "platform-tags",
- "pypi-types",
- "regex",
- "reqwest 0.12.4",
- "reqwest-middleware",
- "rmp-serde",
- "same-file",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror",
- "tokio-util",
- "tracing",
- "url",
- "uv-cache",
- "uv-client",
- "uv-configuration",
- "uv-extract",
- "uv-fs",
- "uv-state",
- "uv-warnings",
- "which",
- "winapi",
-]
-
 [[package]]
 name = "uv-normalize"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "rkyv",
  "serde",
@@ -6040,13 +6190,12 @@ dependencies = [
 [[package]]
 name = "uv-resolver"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
- "anstream",
  "anyhow",
  "cache-key",
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "derivative",
  "distribution-filename",
  "distribution-types",
@@ -6056,8 +6205,8 @@ dependencies = [
  "install-wheel-rs",
  "itertools 0.13.0",
  "once-map",
- "once_cell",
  "owo-colors",
+ "path-slash",
  "pep440_rs",
  "pep508_rs",
  "petgraph",
@@ -6066,21 +6215,22 @@ dependencies = [
  "pypi-types",
  "requirements-txt",
  "rkyv",
- "rustc-hash",
+ "rustc-hash 2.0.0",
+ "same-file",
  "serde",
  "textwrap",
  "thiserror",
  "tokio",
  "tokio-stream",
+ "toml_edit 0.22.13",
  "tracing",
  "url",
- "uv-cache",
  "uv-client",
  "uv-configuration",
  "uv-distribution",
  "uv-git",
- "uv-interpreter",
  "uv-normalize",
+ "uv-toolchain",
  "uv-types",
  "uv-warnings",
 ]
@@ -6088,17 +6238,58 @@ dependencies = [
 [[package]]
 name = "uv-state"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "directories",
  "fs-err",
  "tempfile",
 ]
 
+[[package]]
+name = "uv-toolchain"
+version = "0.0.1"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
+dependencies = [
+ "anyhow",
+ "cache-key",
+ "configparser",
+ "fs-err",
+ "futures",
+ "install-wheel-rs",
+ "itertools 0.13.0",
+ "once_cell",
+ "pep440_rs",
+ "pep508_rs",
+ "platform-tags",
+ "pypi-types",
+ "regex",
+ "reqwest 0.12.4",
+ "reqwest-middleware",
+ "rmp-serde",
+ "same-file",
+ "serde",
+ "serde_json",
+ "target-lexicon",
+ "tempfile",
+ "thiserror",
+ "tokio-util",
+ "tracing",
+ "url",
+ "uv-cache",
+ "uv-client",
+ "uv-configuration",
+ "uv-extract",
+ "uv-fs",
+ "uv-state",
+ "uv-warnings",
+ "which",
+ "winapi",
+]
+
 [[package]]
 name = "uv-types"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anyhow",
  "distribution-types",
@@ -6106,24 +6297,25 @@ dependencies = [
  "pep440_rs",
  "pep508_rs",
  "pypi-types",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "thiserror",
  "url",
  "uv-cache",
  "uv-configuration",
- "uv-interpreter",
+ "uv-git",
  "uv-normalize",
+ "uv-toolchain",
 ]
 
 [[package]]
 name = "uv-version"
-version = "0.2.4"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+version = "0.2.18"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 
 [[package]]
 name = "uv-virtualenv"
 version = "0.0.4"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "fs-err",
  "itertools 0.13.0",
@@ -6133,19 +6325,19 @@ dependencies = [
  "thiserror",
  "tracing",
  "uv-fs",
- "uv-interpreter",
+ "uv-toolchain",
  "uv-version",
 ]
 
 [[package]]
 name = "uv-warnings"
 version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
 dependencies = [
  "anstream",
  "once_cell",
  "owo-colors",
- "rustc-hash",
+ "rustc-hash 2.0.0",
 ]
 
 [[package]]
@@ -6154,6 +6346,18 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
+[[package]]
+name = "value-trait"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4"
+dependencies = [
+ "float-cmp",
+ "halfbrown",
+ "itoa",
+ "ryu",
+]
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -6761,6 +6965,38 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "zip"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "flate2",
+ "indexmap 2.2.6",
+ "memchr",
+ "thiserror",
+ "time",
+ "zopfli",
+]
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
+]
+
 [[package]]
 name = "zstd"
 version = "0.13.1"
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 19206ad0146b1..e6b4c55783929 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -13,21 +13,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pixi";
-  version = "0.24.2";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     rev = "v${version}";
-    hash = "sha256-Qlr4CcrCq29ig3FPFWCR5oOtFrbREm/7zyGXUB3XL98=";
+    hash = "sha256-N8nNB+FOD8n+W7jFYhq9JoEnLOq6xLMLBC77DiK3RLU=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
-      "cache-key-0.0.1" = "sha256-lJJqjxyAzGQKZi6RtzZ7A9pCAOyIJnstHoS8jlUWeGA=";
-      "pubgrub-0.2.1" = "sha256-mAPyo2R996ymzCt6TAX2G7xU1C3vDGjYF0z7R8lI1yg=";
+      "cache-key-0.0.1" = "sha256-tg3zRakZsnf7xBjs5tSlkmhkhHp5HGs6dwrTmdZBTl4=";
+      "pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M=";
     };
   };
 
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 17c201663c02f..811b74b9724f9 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pizauth";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
     rev = "pizauth-${version}";
-    hash = "sha256-Du+MVdYVQgH2V7928kpur+Xp/0y7HXgB8ZC0qciiQvs=";
+    hash = "sha256-9NezG644oCLTWHTdUaUpJbuwkJu3at/IGNH3FSxl/DI=";
   };
 
-  cargoHash = "sha256-DrpYMVGvu7UnzQToVgVptURqp7XyoR1iYUfRSLZaqXw=";
+  cargoHash = "sha256-Lp5ovkQKShgT7EFvQ+5KE3eQWJEQAL68Bk1d+wUo+bc=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
new file mode 100644
index 0000000000000..2ee82abcf42af
--- /dev/null
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  kdePackages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "plasma-panel-colorizer";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "luisbocanegra";
+    repo = "plasma-panel-colorizer";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-+JweNB+zjbXh6Htyvu2vgogAr5Fl5wDPCpm6GV18NJ0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    kdePackages.extra-cmake-modules
+    kdePackages.plasma-desktop
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Fully-featured widget to bring Latte-Dock and WM status bar customization features to the default KDE Plasma panel";
+    homepage = "https://github.com/luisbocanegra/plasma-panel-colorizer";
+    changelog = "https://github.com/luisbocanegra/plasma-panel-colorizer/blob/main/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ HeitorAugustoLN ];
+    inherit (kdePackages.kwindowsystem.meta) platforms;
+  };
+})
diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index cc0d7f0a325ec..1d32f0e5fe39d 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasmusic-toolbar";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "ccatterina";
     repo = "plasmusic-toolbar";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7c+7l9/xg112SVDUqNi12fg6unq6qE6xmMwIrEJk6PQ=";
+    hash = "sha256-Em/5HXKVXAwsWYoJp+50Y+5Oe+JfJ4pYQd0+D7PoyGg=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/po/polkit_gnome/package.nix b/pkgs/by-name/po/polkit_gnome/package.nix
index fd35df9f9e6c9..68779415b09ee 100644
--- a/pkgs/by-name/po/polkit_gnome/package.nix
+++ b/pkgs/by-name/po/polkit_gnome/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.gnome.org/Archive/policykit-gnome";
     description = "Dbus session bus service that is used to bring up authentication dialogs";
     license = lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/pr/prettier-d-slim/package.nix b/pkgs/by-name/pr/prettier-d-slim/package.nix
index 3b92503d7423b..1f3938968fb21 100644
--- a/pkgs/by-name/pr/prettier-d-slim/package.nix
+++ b/pkgs/by-name/pr/prettier-d-slim/package.nix
@@ -23,6 +23,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/mikew/prettier_d_slim";
     license = lib.licenses.mit;
     mainProgram = "prettier_d_slim";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
new file mode 100644
index 0000000000000..8e38f3317646d
--- /dev/null
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -0,0 +1,44 @@
+{
+  beamPackages,
+  fetchFromGitHub,
+  lib,
+}:
+beamPackages.mixRelease rec {
+  pname = "protoc-gen-elixir";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "elixir-protobuf";
+    repo = "protobuf";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-wLU3iM9jI/Zc96/HfPUjNvjteGryWos6IobIb/4zqpw=";
+  };
+
+  mixFodDeps = beamPackages.fetchMixDeps {
+    inherit version src;
+    pname = "protoc-gen-elixir-deps";
+
+    hash = "sha256-H7yiBHoxuiqWcNbWwPU5X0Nnv8f6nM8z/ZAfZAGPZjE=";
+  };
+
+  postBuild = ''
+    mix do escript.build
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp protoc-gen-elixir $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A protoc plugin to generate Elixir code";
+    mainProgram = "protoc-gen-elixir";
+    homepage = "https://github.com/elixir-protobuf/protobuf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mattpolzin ];
+  };
+}
diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index d5a19506a42da..1d31e09525995 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton9-10";
+  version = "GE-Proton9-11";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-dd0qR/iin3VWAMTOvoOURk6s+PNBnZaXBhnxpczL6w8=";
+    hash = "sha256-OGsgR56R/MaFxahsb/42kA9CEexGDF/aTZlyf6v8tXo=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix
index 887c482e6c86f..35a71244cab65 100644
--- a/pkgs/by-name/qu/quickjs-ng/package.nix
+++ b/pkgs/by-name/qu/quickjs-ng/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Mighty JavaScript engine";
     homepage = "https://github.com/quickjs-ng/quickjs";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "qjs";
   };
diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix
new file mode 100644
index 0000000000000..e34be8be3eeff
--- /dev/null
+++ b/pkgs/by-name/qu/quill-log/package.nix
@@ -0,0 +1,30 @@
+{
+  cmake,
+  fetchFromGitHub,
+  lib,
+  stdenv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "quill-log";
+  version = "6.0.0";
+
+  src = fetchFromGitHub {
+    owner = "odygrd";
+    repo = "quill";
+    rev = "v${version}";
+    hash = "sha256-hYnpMgxhL8TIkOzhxf4I/Eeix+BRecNYynuGPm/QwbA=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    homepage = "https://github.com/odygrd/quill";
+    changelog = "https://github.com/odygrd/quill/blob/master/CHANGELOG.md";
+    downloadPage = "https://github.com/odygrd/quill";
+    description = "Asynchronous Low Latency C++17 Logging Library";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = [ maintainers.odygrd ];
+  };
+}
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 6f2333e3d7457..dc06524034adb 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.14.0";
+  version = "0.15.0";
   env.RADICLE_VERSION = version;
 
   src = fetchgit {
     url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
     rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-WuaKYX3rGcIGmz4OAtCvoSwWUr09qfmXM2KI4uGu9s0=";
+    hash = "sha256-wd+ST8ax988CpGcdFb3LUcA686U7BLmbi1k8Y3GAEIc=";
     sparseCheckout = [ "radicle-httpd" ];
   };
   sourceRoot = "${src.name}/radicle-httpd";
-  cargoHash = "sha256-pe+x4fn45I1+6WaLT23KmO7RyAMNdU+7nwG9GSGSeMc=";
+  cargoHash = "sha256-YIux5/BFAZNI9ZwP4lVKj4UGQ4lKrhZ675bCdUaXN70=";
 
   nativeBuildInputs = [
     asciidoctor
diff --git a/pkgs/by-name/re/regols/package.nix b/pkgs/by-name/re/regols/package.nix
index ca04a777f416e..af8f81ff776d9 100644
--- a/pkgs/by-name/re/regols/package.nix
+++ b/pkgs/by-name/re/regols/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "regols";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "kitagry";
     repo = "regols";
     rev = "v${version}";
-    hash = "sha256-nZ0zBCZXVY2AqzsBWm/HOp9wO7Cj1AsSgpi6YwmhfHY=";
+    hash = "sha256-1L9ehqTMN9KHlvE7FBccVAXA7f3NNsLXJaTkOChT8Xo=";
   };
 
-  vendorHash = "sha256-LQdYmsof4CRDBz65Q/YDl+Ll77fvAR/CV/P2RK8a0Lg=";
+  vendorHash = "sha256-yJYWVQq6pbLPdmK4BVse6moMkurlmt6TBd6/vYM1xcU=";
 
   meta = with lib; {
     description = "OPA Rego language server";
diff --git a/pkgs/by-name/re/replxx/package.nix b/pkgs/by-name/re/replxx/package.nix
index de6c2c9313b28..705b12deda356 100644
--- a/pkgs/by-name/re/replxx/package.nix
+++ b/pkgs/by-name/re/replxx/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/AmokHuginnsson/replxx/releases/tag/release-${finalAttrs.version}";
     description = "Readline and libedit replacement that supports UTF-8, syntax highlighting, hints and Windows and is BSD licensed";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/re/revolver/no-external-call.patch b/pkgs/by-name/re/revolver/no-external-call.patch
new file mode 100644
index 0000000000000..9142edd79b193
--- /dev/null
+++ b/pkgs/by-name/re/revolver/no-external-call.patch
@@ -0,0 +1,16 @@
+Replace call to "revolver" with call to internal function.
+Useful when "revolver" is not defined in PATH.
+--- a/revolver
++++ b/revolver
+@@ -255,9 +255,9 @@
+ ###
+ function _revolver_demo() {
+   for style in "${(@k)_revolver_spinners[@]}"; do
+-    revolver --style $style start $style
++    _revolver --style $style start $style
+     sleep 2
+-    revolver stop
++    _revolver stop
+   done
+ }
+ 
diff --git a/pkgs/by-name/re/revolver/package.nix b/pkgs/by-name/re/revolver/package.nix
new file mode 100644
index 0000000000000..37eac352fd825
--- /dev/null
+++ b/pkgs/by-name/re/revolver/package.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  zsh,
+  installShellFiles,
+  ncurses,
+  nix-update-script,
+  testers,
+  runCommand,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "revolver";
+  version = "0.2.4-unstable-2020-09-30";
+
+  src = fetchFromGitHub {
+    owner = "molovo";
+    repo = "revolver";
+    rev = "6424e6cb14da38dc5d7760573eb6ecb2438e9661";
+    hash = "sha256-2onqjtPIsgiEJj00oP5xXGkPZGQpGPVwcBOhmicqKcs=";
+  };
+
+  strictDeps = true;
+  doInstallCheck = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+  buildInputs = [
+    zsh
+    ncurses
+  ];
+  nativeInstallCheckInputs = [ zsh ];
+
+  patches = [ ./no-external-call.patch ];
+
+  postPatch = ''
+    substituteInPlace revolver \
+      --replace-fail "tput cols" "${ncurses}/bin/tput cols"
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D revolver $out/bin/revolver
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    installShellCompletion --cmd revolver --zsh revolver.zsh-completion
+  '';
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    PATH=$PATH:$out/bin revolver --help
+
+    runHook postInstallCheck
+  '';
+
+  passthru = {
+    tests = {
+      demo = runCommand "revolver-demo" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } ''
+        export HOME="$TEMPDIR"
+
+        # Drop stdout, redirect stderr to stdout and check if it's not empty
+        exec 9>&1
+        echo "Running revolver demo..."
+        if [[ $(revolver demo 2>&1 1>/dev/null | tee >(cat - >&9)) ]]; then
+          exit 1
+        fi
+        echo "Demo done!"
+
+        mkdir $out
+      '';
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        # Wrong '0.2.0' version in the code
+        version = "0.2.0";
+      };
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Progress spinner for ZSH scripts";
+    homepage = "https://github.com/molovo/revolver";
+    downloadPage = "https://github.com/molovo/revolver/releases";
+    license = lib.licenses.mit;
+    mainProgram = "revolver";
+    inherit (zsh.meta) platforms;
+    maintainers = with lib.maintainers; [ d-brasher ];
+  };
+})
diff --git a/pkgs/by-name/ro/roslyn-ls/deps.nix b/pkgs/by-name/ro/roslyn-ls/deps.nix
index 22f8b931cfe08..7eb95212be3a1 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.nix
+++ b/pkgs/by-name/ro/roslyn-ls/deps.nix
@@ -2,214 +2,249 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
-  (fetchNuGet { pname = "dotnet-format"; version = "7.0.360304"; sha256 = "1kxsigz0adld1lnqx82nwkrmvi09i4qjz8adxwjqgbls2wi5ks2f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/dotnet-format/7.0.360304/dotnet-format.7.0.360304.nupkg"; })
-  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg"; })
-  (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; sha256 = "1qyfqsv4gv0gnqy73pps10qfsvqm2jcwb5p8bj8zl8ch7gvxwpzg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; })
-  (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; })
-  (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "7.0.0-preview.23525.7"; sha256 = "1vx5wl7rj85889xx8iaqvjw5rfgdfhpc22f6dzkpr3q7ngad6b21"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/7.0.0-preview.23525.7/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.7.0.0-preview.23525.7.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; sha256 = "17g4ka0c28l9v3pmf3i7cvic137h7zg6xqc78qf5j5hj7qbcps5g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.3.2/microsoft.build.17.3.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build"; version = "17.7.2"; sha256 = "18sa4d7yl2gb7hix4v7fkyk1xnr6h0lmav89riscn2ziscanfzlk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build"; version = "17.9.0-preview-23551-05"; sha256 = "0arxaw9xhmy85z9dicpkhmdfc0r03f2f88zzckh1m1gfk6fqzrr0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build/17.9.0-preview-23551-05/microsoft.build.17.9.0-preview-23551-05.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; sha256 = "1p8ikc91qc2b1h68w44brb64dy5kmkb089hdliwp02gba3dszw67"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.3.2/microsoft.build.framework.17.3.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.7.2"; sha256 = "1b0n96h9870g8iy4my3s6mrl15589m3w99h1g3pr0k050rasdmbw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.9.0-preview-23551-05"; sha256 = "0cnjy7j9s97yk0ax82ydih2kq01w4n4y4bx21b4nr156gnz9jf5v"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.9.0-preview-23551-05/microsoft.build.framework.17.9.0-preview-23551-05.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; sha256 = "18xavj7zii38gkk6bkblif7j1j7y33z7f06xm81ljdl2124lbqc4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; sha256 = "1mxm6xrq4illg502kjz4l7j0vjcpfv2li9wrvf4ix9m09vdwk2jl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.2/microsoft.build.tasks.core.17.3.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.7.2"; sha256 = "15drzqhsa1z5zivy2has1nd5qc60z7slk6j96njk27qrd2lpzd9s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.9.0-preview-23551-05"; sha256 = "1byfrjbp8g1zh00n5dh9nm62xphvd9bf5gqmq889715hbybmhhqv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.core/17.9.0-preview-23551-05/microsoft.build.tasks.core.17.9.0-preview-23551-05.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; sha256 = "0r82hrjjqpxjp3l7ncy8jdj30p7y0p1hhr1dbfrj5l3i0zxrrcj4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.2/microsoft.build.utilities.core.17.3.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.7.2"; sha256 = "10330h9nnplr7fd01204xqndj7zx6sl392z3wgdmjgzflz84bax1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.9.0-preview-23551-05"; sha256 = "0s4r68bfhmf6r9v9r54wjnkb6bd1y15aqqiwv0j10gycwzwhjk09"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.utilities.core/17.9.0-preview-23551-05/microsoft.build.utilities.core.17.9.0-preview-23551-05.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.4/microsoft.codeanalysis.analyzers.3.3.4.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.11.0-beta1.24081.1"; sha256 = "1f6qw43srj8nsrd6mnpy028z45arjxlw2h4ca8z6qwr81zy7yhz5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.4/microsoft.codeanalysis.bannedapianalyzers.3.3.4.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; sha256 = "1mbwbp0gq6fnh2fkvsl9yzry9bykcar58gbzx22y6x6zw74lnx43"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.elfie/1.0.0/microsoft.codeanalysis.elfie.1.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "8.0.0-preview.23468.1"; sha256 = "1y2jwh74n88z1rx9vprxijx7f00i6j89ffiy568xsbzddsf7s0fv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/8.0.0-preview.23468.1/microsoft.codeanalysis.netanalyzers.8.0.0-preview.23468.1.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers"; version = "3.3.4-beta1.22504.1"; sha256 = "179b4r9y0ylz8y9sj9yjlag3qm34fzms85fywq3a50al32sq708x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22504.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22504.1.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; sha256 = "0cp5c6093xnhppzyjdxhbi9ik1rfk7ba639ps9mkfmqp4qqp8z4x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; sha256 = "0g4fqxqy68bgsqzxdpz8n1sw0az1zgk33zc0xa8bwibwd1k2s6pj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "8.0.0-beta.24113.2"; sha256 = "004bbkzqk61p0k7hfcx4hmzdwj684v1nyjs55zrl8xpk3pchaw4v"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/8.0.0-beta.24113.2/microsoft.dotnet.arcade.sdk.8.0.0-beta.24113.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; sha256 = "0zb41d8vv24lp4ysrpx6y11hfkzp45hp7clclgqc1hagrqpl9i75"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/8.0.0/microsoft.extensions.configuration.binder.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/8.0.0/microsoft.extensions.dependencyinjection.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/8.0.0/microsoft.extensions.logging.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/8.0.0/microsoft.extensions.logging.abstractions.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/8.0.0/microsoft.extensions.logging.configuration.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/8.0.0/microsoft.extensions.logging.console.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "6.0.0"; sha256 = "12w6mjbq5wqqwnpclpp8482jbmz4a41xq450lx7wvjhp0zqxdh17"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.objectpool/6.0.0/microsoft.extensions.objectpool.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.0/microsoft.io.redist.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.10.0-1.24061.4"; sha256 = "1irnlg14ffymmxr5kgqyqja7z3jsql3wn7nmbbfnyr8y625jbn2g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/4.10.0-1.24061.4/microsoft.net.compilers.toolset.4.10.0-1.24061.4.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.3.2/microsoft.net.stringtools.17.3.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.7.2"; sha256 = "12izr6vdf8dqfra2445w2zxz8diwl2nmciynpfr0nwd063nk80c5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.9.0-preview-23551-05"; sha256 = "0iq5pkdhlgpawq7kyxpzhdxlais89wyl5c3jr6ch7vb61lfrbwzb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.stringtools/17.9.0-preview-23551-05/microsoft.net.stringtools.17.9.0-preview-23551-05.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.3/microsoft.netframework.referenceassemblies.1.0.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; sha256 = "0z7mpiljkqjw1qi5zapv7mg9pyfyzlgmil34j4wi3y9r19bsb87z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.3/microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.ServiceHub.Analyzers"; version = "4.4.22"; sha256 = "0zfy8r1jn0v3fl1jaia1iblyh72i5cvkkcgxpniwpp8h1hbpkxbg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.4.22/microsoft.servicehub.analyzers.4.4.22.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.ServiceHub.Client"; version = "4.2.1017"; sha256 = "082l1kz1jy1g0dczzb5ysxrgb4aq4z53ydpx744gfr99h75mzj01"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.ServiceHub.Framework"; version = "4.4.22"; sha256 = "07wr0ix76cdrpiaajpblkpzfl194f4k5majxfm11dfpllyg08z4r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.framework/4.4.22/microsoft.servicehub.framework.4.4.22.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.ServiceHub.Resources"; version = "4.2.1017"; sha256 = "1p0qk5nfzn12vbnl6nzlixzas5p4cckd8j6ki8mi6knbqn7baypa"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "1y0cv7lzn5gvh75bimikqqd5wv1gxnrh85wxi9b3qsfixpdavh1k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.5.0/microsoft.testplatform.objectmodel.17.5.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.5.0"; sha256 = "04340sz5djyawmz43sf0h6qyza2pmmnsw70l4sbkmwn5bxg1wn5d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.translationlayer/17.5.0/microsoft.testplatform.translationlayer.17.5.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "17.7.29"; sha256 = "02aj4q4xiykmj14rnf2nr2llcqfj8bgqnk0wnabsil00qkx8rw0x"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.7.29/microsoft.visualstudio.composition.17.7.29.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.Analyzers"; version = "17.7.40"; sha256 = "1zqgff4gg2r07lnz3p7f1188536jj83hl88npswp4hrb3lqsd5wf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.7.40/microsoft.visualstudio.composition.analyzers.17.7.40.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; sha256 = "04fdz3dj1wdnr8a6bm81l1105lb9x6lwirsa66skig38rwhs1xr7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; sha256 = "0d3prb0i8h35l46am18d1qi62qcyrfslqbgj4lqal8c7r78n3kl9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.9.13"; sha256 = "1a17j0dfydq2jjpb3sfllzjmpv6zrfdxxji86yj0lj2hdi9hhb72"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.9.13/microsoft.visualstudio.telemetry.17.9.13.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.9.3-alpha"; sha256 = "1k36jgaqikj9cvlfqhwpl06qjh9na7ppp3kphyn364rpbr85d2r2"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.9.3-alpha/microsoft.visualstudio.threading.17.9.3-alpha.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.12-preview"; sha256 = "05a8k79qgcffzpjcw6b5fg50isgla7xvbra8z7p970w8ih5cb7b2"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.10.12-preview/microsoft.visualstudio.threading.analyzers.17.10.12-preview.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.56"; sha256 = "14z8qd6wkx5m79wph2fyf0hfj8z8fv93pjv8z39vpnxpfkq0rqhy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.56/microsoft.visualstudio.utilities.internal.16.3.56.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; sha256 = "0sra63pv7l51kyl89d4g3id87n00si4hb7msrg7ps7c930nhc7xh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/5.0.0/microsoft.win32.registry.5.0.0.nupkg"; })
-  (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nerdbank.streams/2.10.69/nerdbank.streams.2.10.69.nupkg"; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.3/newtonsoft.json.13.0.3.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-rc.112"; sha256 = "15qpl1s25h5b3rqc7k0p8iirr0n344ard5z624gy20as4zr0bwid"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-rc.112/nuget.common.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-rc.112"; sha256 = "0z0nnyyfg5k9p1zz9845vsa5piy2nqs9qmfnbn7wapcs321p0s5m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-rc.112/nuget.configuration.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-rc.112"; sha256 = "0ax127jjmrrahhc1qxxn0wqpg18ydqwsmw5w8141gcgswjdhlbcx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.112/nuget.dependencyresolver.core.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.frameworks/5.11.0/nuget.frameworks.5.11.0.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-rc.112"; sha256 = "1bfv6q3gnvjbhx1d6y60sgkysy3qvp6and69vmbf2sygkzzrinfi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-rc.112/nuget.frameworks.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-rc.112"; sha256 = "125h1jbcaqkndghakhl43bvm195cbwwrm78i1l1rkph2s5x46ggh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-rc.112/nuget.librarymodel.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-rc.112"; sha256 = "1213nlqxqbbidj6w296hsb0l6sm21d7dm77cj0hfyxqjhi63vlb7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-rc.112/nuget.packaging.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.112"; sha256 = "0yy2jfl3r8a4d8dbdfxwpamla4c3zi9998ip9y2rskliykaj3r41"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.112/nuget.projectmodel.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.112"; sha256 = "1xbyd4rb22pcd4j38gh4gybm9qwrn5zp9k8792dhi7in58jcrgza"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.112/nuget.protocol.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.112"; sha256 = "04a5x8p11xqqwd9h1bd3n48c33kasv3xwdq5s9ip66i9ki5icc07"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.112/nuget.versioning.6.8.0-rc.112.nupkg"; })
-  (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; sha256 = "13jhnbh12rcmdrkmlxq45ard03lmfq7bg14xg7k108jlpnpsr1la"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; sha256 = "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; })
-  (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.11.0-beta1.24081.1"; sha256 = "1hslhghwmvrlmd5hii1v6l2356hbim5mz3bvnqrdqynq1cms30y0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.bundle_green/2.1.0/sqlitepclraw.bundle_green.2.1.0.nupkg"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.core/2.1.0/sqlitepclraw.core.2.1.0.nupkg"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.lib.e_sqlite3/2.1.0/sqlitepclraw.lib.e_sqlite3.2.1.0.nupkg"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.e_sqlite3/2.1.0/sqlitepclraw.provider.e_sqlite3.2.1.0.nupkg"; })
-  (fetchNuGet { pname = "StreamJsonRpc"; version = "2.17.9"; sha256 = "03c9yl99rxw3by9xb7g3rf512p04qxqyxdqza7cis6k47l3fvklw"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.17.9/streamjsonrpc.2.17.9.nupkg"; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; })
-  (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; sha256 = "08a2k2v7kdx8wmzl4xcpfj749yy476ggqsy4cps4iyqqszgyv0zc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.24112.1"; sha256 = "0p66jzjwwgir0xn3cy31ixlws4v9lb1l72xh5mrc38f37m4la23b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.24112.1/system.commandline.2.0.0-beta4.24112.1.nupkg"; })
-  (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "7.0.0"; sha256 = "1gkn56gclkn6qnsvaw5fzw6qb45pa7rffxph1gyqhq7ywvmm0nc3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/7.0.0/system.componentmodel.composition.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/8.0.0/system.composition.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/7.0.0/system.composition.attributedmodel.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/8.0.0/system.composition.attributedmodel.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/8.0.0/system.composition.convention.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/8.0.0/system.composition.hosting.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/8.0.0/system.composition.runtime.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/8.0.0/system.composition.typedparts.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; sha256 = "08dadpd8lx6x7craw3h3444p7ncz4wk0a3j1681lyhhd56ln66f6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/8.0.0/system.configuration.configurationmanager.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/8.0.0/system.diagnostics.diagnosticsource.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; sha256 = "1xnvcidh2qf6k7w8ij1rvj0viqkq84cq47biw0c98xhxg5rk3pxf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/8.0.0/system.diagnostics.eventlog.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "7.0.0"; sha256 = "1xg45w9gr7q539n2p0wighsrrl5ax55az8v2hpczm2pi0xd7ksdp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/6.0.0/system.formats.asn1.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; sha256 = "00f36lqz1wf3x51kwk23gznkjjrf5nmqic9n7073nhrgrvb43nid"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/8.0.0/system.io.pipelines.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.IO.Pipes"; version = "4.3.0"; sha256 = "1ygv16gzpi9cnlzcqwijpv7055qc50ynwg3vw29vj1q3iha3h06r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes/4.3.0/system.io.pipes.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Management"; version = "7.0.0"; sha256 = "1x3xwjzkmlcrj6rl6f2y8lkkp1s8xkhwqlpqk9ylpwqz7w3mhis0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/7.0.0/system.management.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.5/system.memory.4.5.5.nupkg"; })
-  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; })
-  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; sha256 = "019s7jz73d236p23mnpfaxxwib019i0v1fbwbkys0hskgddvw7cc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.2/system.private.uri.4.3.2.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.7.0/system.reflection.emit.ilgeneration.4.7.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.7.0/system.reflection.emit.lightweight.4.7.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/6.0.0/system.reflection.metadataloadcontext.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "7.0.0"; sha256 = "0cmrvrmsf8hifcfyspmqmd4pv4h2g9yj87hf0fyl5pzma147m2am"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/7.0.0/system.reflection.metadataloadcontext.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Resources.Extensions"; version = "7.0.0"; sha256 = "0d5gk5g5qqkwa728jwx9yabgjvgywsy6k8r5vgqv2dmlvjrqflb4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/7.0.0/system.resources.extensions.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/6.0.1/system.security.cryptography.pkcs.6.0.1.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/6.0.4/system.security.cryptography.pkcs.6.0.4.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; sha256 = "0px6snb8gdb6mpwsqrhlpbkmjgd63h4yamqm2gvyf9rwibymjbm9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/8.0.0/system.security.cryptography.protecteddata.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/6.0.0/system.security.cryptography.xml.6.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "7.0.1"; sha256 = "0p6kx6ag0il7rxxcvm84w141phvr7fafjzxybf920bxwa0jkwzq8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Permissions"; version = "8.0.0"; sha256 = "0lqzh9f7ppmmh10mcv22m6li2k8jdbpaywxn7jgkk7f7xmihz1gr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/8.0.0/system.security.permissions.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.0/system.text.json.8.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/7.0.0/system.threading.tasks.dataflow.7.0.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; })
-  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; })
-  (fetchNuGet { pname = "System.Windows.Extensions"; version = "8.0.0"; sha256 = "13fr83jnk7v00cgcc22i5d9xbl794b6l0c5v9g8k0l36pgn36yb8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/8.0.0/system.windows.extensions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "dotnet-format"; version = "7.0.360304"; hash = "sha256-TuhZIhearocl702hLzGJCcRd8+RWoI4tDY02Bf6Lus8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/dotnet-format/7.0.360304/dotnet-format.7.0.360304.nupkg"; })
+  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg"; })
+  (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; hash = "sha256-71/e9zuQIfqRXOiWxZkUFW/tMAj63nE8tg/sR7bGzuM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; })
+  (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; })
+  (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.30"; hash = "sha256-/uaXb6r1ojvkib/+GfiPIJJ1V7cEl7qSmV6v0jqiY54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/6.0.30/microsoft.aspnetcore.app.ref.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.19"; hash = "sha256-PVACGeA+365Y+k0Rz1MAhLCrHkiD2clxuD3rRLqF8qY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/7.0.19/microsoft.aspnetcore.app.ref.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.5"; hash = "sha256-8bnOW8zz8R3muhxape8aCloir/P7vFoleYavsFnpwmg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.5/microsoft.aspnetcore.app.ref.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.30"; hash = "sha256-+V5JFtAEdjwQAW3LaEzueknB2pURmxWA/FDm9fMtm9g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/6.0.30/microsoft.aspnetcore.app.runtime.linux-arm64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.19"; hash = "sha256-nw+TDPVINCWWAeKqPWzE7ceJiwV384o/xLLSBDyDFUU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/7.0.19/microsoft.aspnetcore.app.runtime.linux-arm64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.5"; hash = "sha256-xeL0pyTzABVa1oPN8+jtWPNLGNd0KNf4WzPtrQeexm4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.5/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.30"; hash = "sha256-uT0fF+tZNpKtc1RboPyOqFllcp3NeONU76WSgw+gYKM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/6.0.30/microsoft.aspnetcore.app.runtime.linux-x64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.19"; hash = "sha256-98uE6t6Vegs3uMlF9Y73sRiY2JaxzVqHneOn+STC1/8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/7.0.19/microsoft.aspnetcore.app.runtime.linux-x64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.5"; hash = "sha256-EOuon2mG2NaWwnF2OWjND22zBQsMK5J7B9tz8JG5L9U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.5/microsoft.aspnetcore.app.runtime.linux-x64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.30"; hash = "sha256-E8uSz3kCGoRZI4DFk5U0SqWVmq5vXQFE9cKWXLGno1w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/6.0.30/microsoft.aspnetcore.app.runtime.osx-arm64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.19"; hash = "sha256-6Nh9ejevjsLNYEBRHTX+cbta7Hty2yuwO756zrGmEbc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/7.0.19/microsoft.aspnetcore.app.runtime.osx-arm64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.5"; hash = "sha256-PJ5bQGi6f9UF1eQwLXGLGKVdji+5bCoNZcYYE0XlSdQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.5/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.30"; hash = "sha256-DGcTbczrffU+ud8H+1Kc6+pRRg3T5D5Ss3J+tRHNOgE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/6.0.30/microsoft.aspnetcore.app.runtime.osx-x64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.19"; hash = "sha256-QwkbgRc8M5O1sYBnWxnXK25Im4X+LfPUUapqK7s+r8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/7.0.19/microsoft.aspnetcore.app.runtime.osx-x64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.5"; hash = "sha256-VwREoo86OVp6ss5X9QjpTdw3e5nUDVnm7OidIO/PrFU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.5/microsoft.aspnetcore.app.runtime.osx-x64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "9.0.0-preview.24327.6"; hash = "sha256-lK1mJ36CZKI+a6RKjAfmM0TD3zYYnasTzVnq3nFmI7M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.24327.6/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.24327.6.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/8.0.0/microsoft.bcl.asyncinterfaces.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build"; version = "17.10.4"; hash = "sha256-yaElGdmgcELCXR5fIe5/ingMx2qS/PM3tZGTPNHHjXo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.10.4/microsoft.build.17.10.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.4"; hash = "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build"; version = "17.7.2"; hash = "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.10.4"; hash = "sha256-J9N2VDoyd2P0e4PLhI3XsYsiyE0vKSIerhglV0FW+Bk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.10.4/microsoft.build.framework.17.10.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.4"; hash = "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.7.2"; hash = "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; hash = "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.10.4"; hash = "sha256-paqlEbSdV5euFvWQ4khlIcsTxIGQ1/YpoM/XXDQSPBY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.10.4/microsoft.build.tasks.core.17.10.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.4"; hash = "sha256-0RA95pD6zHBf1lgYyrrAuEuNeGwuCgGxNdhEJ0cJUCs="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.7.2"; hash = "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.10.4"; hash = "sha256-eHEObY1YqK/+hOJmUzSu7u/dKp/OX5qQOWk07rEUReQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.10.4/microsoft.build.utilities.core.17.10.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.4"; hash = "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.7.2"; hash = "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.4/microsoft.codeanalysis.analyzers.3.3.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; hash = "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; hash = "sha256-g3RLyeHfdOOF6H89VLJi06/k8/eJ6j2dgNYZ/MBdfNU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; hash = "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.elfie/1.0.0/microsoft.codeanalysis.elfie.1.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "8.0.0-preview.23468.1"; hash = "sha256-2wF9nG7tL92RKT46l5A0EQB3uow93516Dh8hSw7kUvg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/8.0.0-preview.23468.1/microsoft.codeanalysis.netanalyzers.8.0.0-preview.23468.1.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers"; version = "3.3.4-beta1.22504.1"; hash = "sha256-HYGDtRhUgaIG5t4VpOt3ZFQ8nqLSJ6mTR5964FMmK50="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22504.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22504.1.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24352.2"; hash = "sha256-ABdgrKht2runHUtSNpTsv7BTDQaRA3AenjSwaof+3nA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24352.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24352.2.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; hash = "sha256-5cREL85PwcDwo4yyc2Eh908HQ/Cm36w9uZSIvVELZH0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/8.0.0/microsoft.extensions.configuration.binder.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/8.0.0/microsoft.extensions.dependencyinjection.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/8.0.0/microsoft.extensions.logging.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/8.0.0/microsoft.extensions.logging.abstractions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/8.0.0/microsoft.extensions.logging.configuration.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/8.0.0/microsoft.extensions.logging.console.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "8.0.0"; hash = "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.objectpool/8.0.0/microsoft.extensions.objectpool.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/8.0.0/microsoft.extensions.options.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/8.0.0/microsoft.extensions.options.configurationextensions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/8.0.0/microsoft.extensions.primitives.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; hash = "sha256-pa3MT+QWrWeehQwUWtTS/Rwto8IIDgAt+zLqaUAQoJ0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.0/microsoft.io.redist.6.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.10.4"; hash = "sha256-nXY7YaIx6sXn7aMqpF4bW4d2J5U1KNb9sXqRSd8MpOc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.10.4/microsoft.net.stringtools.17.10.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.4"; hash = "sha256-xLPrrL8iS3gNMIa/C/Wv0fBfHIehUHeQ4Y+F+gbqkhk="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.net.stringtools/17.3.4/microsoft.net.stringtools.17.3.4.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.7.2"; hash = "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.30"; hash = "sha256-UUBrqoCcx87bRHixJ536+nPmKvS46oH4MbY0aSuUb1A="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/6.0.30/microsoft.netcore.app.host.linux-arm64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.19"; hash = "sha256-FRoUVPlgC17Y3E0eSahP83MdChzG2TD1KHIedcDcZLc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/7.0.19/microsoft.netcore.app.host.linux-arm64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.5"; hash = "sha256-/p+D7NwTlCcQ6IawqD3uMEPmb2Z2SQZKnwXbMt7Rkqw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.5/microsoft.netcore.app.host.linux-arm64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.30"; hash = "sha256-q+avr/1ihBsmSB7zmLAGhtJGdo/YR7qvd+pAwRAIQ2s="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/6.0.30/microsoft.netcore.app.host.linux-x64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.19"; hash = "sha256-7d9qcnPs9Rbpe68gexGLKgCgeppMhdo595dNRrCqjkk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/7.0.19/microsoft.netcore.app.host.linux-x64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.5"; hash = "sha256-+gpggufdoUkKzlQ+vH5dHYM5CdkrNWvMzq2qB+OvBIA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.5/microsoft.netcore.app.host.linux-x64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.30"; hash = "sha256-ww4qlbliyV8PshntmvnLRSvdQpOObbCmCEezXcvYZSI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/6.0.30/microsoft.netcore.app.host.osx-arm64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.19"; hash = "sha256-YzCq0yqF95dFho9jpFvHsT6FM+8W4S95YtXa01oFzHc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/7.0.19/microsoft.netcore.app.host.osx-arm64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.5"; hash = "sha256-Yie8nSB+O2SZ8m9sfT3KFmX925kvuTeEs9+/J/EpVug="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.5/microsoft.netcore.app.host.osx-arm64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.30"; hash = "sha256-nKKxZMyZ0MCdgSsuAtdKpLNMKGs21lQyhciqjgxDows="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/6.0.30/microsoft.netcore.app.host.osx-x64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.19"; hash = "sha256-2KR6C0so+1Tt/LQT++rf2L/09BbWLQSGRmhb0xEBPes="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/7.0.19/microsoft.netcore.app.host.osx-x64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.5"; hash = "sha256-8KSVJSTIdl6gQHpTng5P32N0Y8iaGGiYiqWf4yDWZvM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.5/microsoft.netcore.app.host.osx-x64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.30"; hash = "sha256-KPj4Sd4KYfin1lO1pvGXQAPMLRxvjs5krI18TCGUGPM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/6.0.30/microsoft.netcore.app.ref.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.19"; hash = "sha256-ifOwgrP1LIDR+lTlTBeZtv6nZItxZsxqgt5YzNh3P/0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/7.0.19/microsoft.netcore.app.ref.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.5"; hash = "sha256-FH5B6bFeaIssCwoHdN/hnTvUaAb1FR8f/nsq7gn1XFY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.5/microsoft.netcore.app.ref.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.30"; hash = "sha256-Zyw+yhtNkNHvPN+FD/22RNoNUbOwjduzQWnIN15k0HU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/6.0.30/microsoft.netcore.app.runtime.linux-arm64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.19"; hash = "sha256-ozpp2Fm8ugRc2C82Fg714aYKE/rI4oQKiojQn6dXYFQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/7.0.19/microsoft.netcore.app.runtime.linux-arm64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.5"; hash = "sha256-L6UNg+yDagcnuA0yXpvROGE2OWg2OaDTZk/ZFJ1xogI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.5/microsoft.netcore.app.runtime.linux-arm64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.30"; hash = "sha256-nevXT/HqMg6PGzRDz0SwtAQUOWJ7wM4V/hotS5HUAek="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/6.0.30/microsoft.netcore.app.runtime.linux-x64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.19"; hash = "sha256-Oq+huaBdLyho3zk3eEg0J+WQ6JKq4Az0T4m2tS+C74s="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/7.0.19/microsoft.netcore.app.runtime.linux-x64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.5"; hash = "sha256-LH1ExrmSu7WUi6WWKKhamEACb1q5DJgBbvpwEB1uapc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.5/microsoft.netcore.app.runtime.linux-x64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.30"; hash = "sha256-5NaOY2Zjw1DN0oCRsaFwy/hoLbH1FQN15H8q1USa4Wg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/6.0.30/microsoft.netcore.app.runtime.osx-arm64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.19"; hash = "sha256-ocHOilMU+/X1l9TtiRYWg3latrdN7+F1rE+Nnwc4+iE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/7.0.19/microsoft.netcore.app.runtime.osx-arm64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.5"; hash = "sha256-jwMu/bGs0XriqtL3F9YI82A6l1LHaEjKwXimRX+73aE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.5/microsoft.netcore.app.runtime.osx-arm64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.30"; hash = "sha256-QaWoheInWMn/FwEE26vG1mG3sLArb1FtyICIxsXDy3c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/6.0.30/microsoft.netcore.app.runtime.osx-x64.6.0.30.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.19"; hash = "sha256-vXsfBxBrXPyGO4Bm8dTyQ9eZcvmSu4HmPbWoz3TnltM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/7.0.19/microsoft.netcore.app.runtime.osx-x64.7.0.19.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.5"; hash = "sha256-+8Dd0bgia223maQ7JYRiGmrO4jHPoOKcNJGbsF5Svjg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.5/microsoft.netcore.app.runtime.osx-x64.8.0.5.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; hash = "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.3/microsoft.netframework.referenceassemblies.1.0.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; hash = "sha256-/6ClVwo5+RE5kWTQWB/93vmbXj37ql8iDlziKWm89Xw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.3/microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.ServiceHub.Analyzers"; version = "4.5.31"; hash = "sha256-lf2FS26yjXAxLIht8qeQp4YXWGuVbu2xzoOyxQOOLV8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.5.31/microsoft.servicehub.analyzers.4.5.31.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.ServiceHub.Client"; version = "4.2.1017"; hash = "sha256-Achfy4EpZfcIOf02P8onWJH1cte+rP9ZAy94Gf4MVCA="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.ServiceHub.Framework"; version = "4.5.31"; hash = "sha256-KHFz3F+cgK6dWqHW33ihCQXaTUg/v+LFwW0v+PG596E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.framework/4.5.31/microsoft.servicehub.framework.4.5.31.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.ServiceHub.Resources"; version = "4.2.1017"; hash = "sha256-6nq1jsXLThMritNI1CZj5Batfo/0W0Pt2iLY72yZGNw="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-M8Ct2u3RaTxWip0XBLPtL2xeGsYz1rjKgfsV++nZDPg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.5.0/microsoft.testplatform.objectmodel.17.5.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.5.0"; hash = "sha256-rVgeXl/F8jqXJhQcrm2tV6jvsYHA6UF+5crLVr4GZBA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.translationlayer/17.5.0/microsoft.testplatform.translationlayer.17.5.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "17.10.37"; hash = "sha256-Lq0XlMb7eqfMsu+NsptjCZReU3vRH5+JGvPU1VbuyEY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition/17.10.37/microsoft.visualstudio.composition.17.10.37.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.Analyzers"; version = "17.10.37"; hash = "sha256-pckf7uZKhMSLxGHtrR2P3qdeNTtEDjAJGvagQ0Oocww="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.10.37/microsoft.visualstudio.composition.analyzers.17.10.37.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; hash = "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; hash = "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.11.8"; hash = "sha256-w6VeYf5feF1HGpz8g7u7ytEXH3Ve8LLkG+SM4uNpDj4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.11.8/microsoft.visualstudio.telemetry.17.11.8.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.10.41"; hash = "sha256-amoJoKroXLRzlpMGH6HwBLnOge4LqgnOmEitQvz/XHQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading/17.10.41/microsoft.visualstudio.threading.17.10.41.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.41"; hash = "sha256-3hn7R+RHr6AInqPv3OrpsYiI7JdM2+qqIJlyG3kWptU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.10.41/microsoft.visualstudio.threading.analyzers.17.10.41.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.73"; hash = "sha256-cy55eLkYdpz/WrV9fGCihFaAn97O8+FTPA/ZpQ0BTxY="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; hash = "sha256-sB8GLRiJHX3Py7qeBUnUANiDWhyPtISon6HQs+8wKms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/5.0.0/microsoft.win32.registry.5.0.0.nupkg"; })
+  (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; hash = "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nerdbank.streams/2.10.69/nerdbank.streams.2.10.69.nupkg"; })
+  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; })
+  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.3/newtonsoft.json.13.0.3.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-rc.112"; hash = "sha256-LfIF8idaAeEfEeaXlhUhw4KcY0QXzMNwHqvAInSgF5c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-rc.112/nuget.common.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-rc.112"; hash = "sha256-tWhwgxiaXcWPXdZVnDS2wsdblN6FoPR/uGmW57y3Fnw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-rc.112/nuget.configuration.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-rc.112"; hash = "sha256-nS0Km+T6sRdIQLzwqjluHoV3MQe2dxwYhCrnKuURoSs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.112/nuget.dependencyresolver.core.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.frameworks/5.11.0/nuget.frameworks.5.11.0.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-rc.112"; hash = "sha256-0dmY/5/Pa+FW3ck0q8zdeHjt59PAeNNCh0tu+wY2260="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-rc.112/nuget.frameworks.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-rc.112"; hash = "sha256-8D1DetEC3pkDDRGdmjlfrKRQ9xqEwqnga3ZixZYMsIg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-rc.112/nuget.librarymodel.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-rc.112"; hash = "sha256-Z9E9TIQSd+8gkOyc2k4LompDwdLQJMGNbHEt3DG1I4g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-rc.112/nuget.packaging.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.112"; hash = "sha256-geQh1fSRTp2FTzeilFL8gxFFq7q8u7YaakShPKiTwns="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.112/nuget.projectmodel.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.112"; hash = "sha256-6r/MJCo2ngibSAfNdH+xmeNUl38EPjQkaewKsTJpfvU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.112/nuget.protocol.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.112"; hash = "sha256-BzAWS5wpGnNj0gU33sfWao7BELGjrQBT4xj3EC7qRRE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.112/nuget.versioning.6.8.0-rc.112.nupkg"; })
+  (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; hash = "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; hash = "sha256-bwND+Na9iEnkEdeL1elY34+m4/F4BYATBHv/2BEw4d4="; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; })
+  (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; hash = "sha256-W14WMqNZndRmnySqLdFqmvfbH14kJxMV6+/4dIS0CwE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.bundle_green/2.1.0/sqlitepclraw.bundle_green.2.1.0.nupkg"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; hash = "sha256-l1lfw114VmMprNFNn1fM/wzKEbDywXDlgdTQWWbqBU8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.core/2.1.0/sqlitepclraw.core.2.1.0.nupkg"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; hash = "sha256-XsObwf7Fza9G1JCZvQ+SqMqQUdZNU3WcJYYp3cqfc8U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.lib.e_sqlite3/2.1.0/sqlitepclraw.lib.e_sqlite3.2.1.0.nupkg"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; hash = "sha256-2JLlOroGdfziGi+VpgBjtm9IHofG976T+9lZb+fQRok="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.dynamic_cdecl/2.1.0/sqlitepclraw.provider.dynamic_cdecl.2.1.0.nupkg"; })
+  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; hash = "sha256-VkGdCCECj+0oaha/QsyfF9CQoaurC/KO2RHR2GaI77w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.e_sqlite3/2.1.0/sqlitepclraw.provider.e_sqlite3.2.1.0.nupkg"; })
+  (fetchNuGet { pname = "StreamJsonRpc"; version = "2.18.48"; hash = "sha256-/vjpwKMFoJfSf+uKEjmWzW/HdIfDGMLb7el91ni6gFQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/streamjsonrpc/2.18.48/streamjsonrpc.2.18.48.nupkg"; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; })
+  (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; hash = "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.24324.3"; hash = "sha256-YjxPnyDiCahE9Ip+un1uoXpW6+pXBCRQNL0juRLZJDE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.24324.3/system.commandline.2.0.0-beta4.24324.3.nupkg"; })
+  (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; hash = "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/8.0.0/system.componentmodel.composition.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/8.0.0/system.composition.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; hash = "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/8.0.0/system.composition.attributedmodel.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; hash = "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/8.0.0/system.composition.convention.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; hash = "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/8.0.0/system.composition.hosting.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; hash = "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/8.0.0/system.composition.runtime.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; hash = "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/8.0.0/system.composition.typedparts.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/8.0.0/system.configuration.configurationmanager.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; hash = "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/8.0.0/system.diagnostics.diagnosticsource.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/8.0.0/system.diagnostics.eventlog.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "7.0.0"; hash = "sha256-t+l5WgfxivrZhWKjr0rpqtCcNXyRgytsGgWf/BIv5PU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; hash = "sha256-eMF+SD/yeslf/wOIlOTlpfpj3LtP6HUilGeSj++bJKg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; hash = "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/8.0.0/system.io.pipelines.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.IO.Pipes"; version = "4.3.0"; hash = "sha256-2QA4FIwDB7mT4Hs8bj0oDJcCzr4ycsw+tSzF+58J+/k="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes/4.3.0/system.io.pipes.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Management"; version = "7.0.0"; hash = "sha256-QEdYBz8f80t9mvhSzOHsSIc7J0VeOEOzkZnROr/kffQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/7.0.0/system.management.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.5/system.memory.4.5.5.nupkg"; })
+  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; })
+  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; hash = "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.2/system.private.uri.4.3.2.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.7.0/system.reflection.emit.ilgeneration.4.7.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.7.0/system.reflection.emit.lightweight.4.7.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; hash = "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/6.0.0/system.reflection.metadataloadcontext.6.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "7.0.0"; hash = "sha256-VYl6SFD130K9Aw4eJH16ApJ9Sau4Xu0dcxEip2veuTI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/7.0.0/system.reflection.metadataloadcontext.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "8.0.0"; hash = "sha256-jS5XPZiHjY2CJFnLSxL6U7lMrU3ZknvB4EOgMbG0LEo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/8.0.0/system.reflection.metadataloadcontext.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Resources.Extensions"; version = "8.0.0"; hash = "sha256-5dHZdRwq0tdQanaU5Hw3QISvqSijSGrTa2VdgwifGDI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/8.0.0/system.resources.extensions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; hash = "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/8.0.0/system.security.cryptography.protecteddata.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "7.0.1"; hash = "sha256-CH8+JVC8LyCSW75/6ZQ7ecMbSOAE1c16z4dG8JTp01w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg"; })
+  (fetchNuGet { pname = "System.Security.Permissions"; version = "8.0.0"; hash = "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/8.0.0/system.security.permissions.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/8.0.0/system.text.encodings.web.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.0/system.text.json.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; hash = "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; hash = "sha256-Q6fPtMPNW4+SDKCabJzNS+dw4B04Oxd9sHH505bFtQo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/8.0.0/system.threading.tasks.dataflow.8.0.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; })
+  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; })
+  (fetchNuGet { pname = "System.Windows.Extensions"; version = "8.0.0"; hash = "sha256-aHkz7LtmUDDRS7swQM0i6dDVUytRCMYeA2CfaeVA2Y0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/8.0.0/system.windows.extensions.8.0.0.nupkg"; })
 ]
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index bc50c7f10cda9..b9b422cbbc62e 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -1,29 +1,28 @@
 { lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, stdenvNoCC, testers, roslyn-ls, jq }:
 let
   pname = "roslyn-ls";
-  # see https://github.com/dotnet/roslyn/blob/main/eng/targets/TargetFrameworks.props
-  dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 ];
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
   # need sdk on runtime as well
-  dotnet-runtime = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnet-sdk;
 
   project = "Microsoft.CodeAnalysis.LanguageServer";
 in
 buildDotnetModule rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.22.2";
+  vsVersion = "2.39.29";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-j7PXgYjISlPBbhUEEIxkDlOx7TMYPHtC3KH2DViWxJ8=";
+    hash = "sha256-E0gha6jZnXyRVH5XUuXxa7H9+2lfD9XTlQcNSiQycHA=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "4.10.0-2.24124.2";
-  projectFile = "src/Features/LanguageServer/${project}/${project}.csproj";
+  version = "4.12.0-1.24359.11";
+  projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.nix;
 
@@ -36,13 +35,16 @@ buildDotnetModule rec {
 
     substituteInPlace $projectFile \
       --replace-fail \
-        '>win-x64;win-x86;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' \
+        '>win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' \
         '>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>'
   '';
 
   dotnetFlags = [
     # this removes the Microsoft.WindowsDesktop.App.Ref dependency
     "-p:EnableWindowsTargeting=false"
+    # see this comment: https://github.com/NixOS/nixpkgs/pull/318497#issuecomment-2256096471
+    # we can remove below line after https://github.com/dotnet/roslyn/issues/73439 is fixed
+    "-p:UsingToolMicrosoftNetCompilers=false"
   ];
 
   # two problems solved here:
diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index 2dfb009c5cd27..54c434e975c3c 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -16,16 +16,16 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-sEAAK8WeDQrRY6IEaiQwsDdKXetjuMCjhElbM6S8vsA=";
+    hash = "sha256-+NIRWciQISbR8+agDJBH/aHFJ+yCkC6nNFtv+HprrRs=";
   };
 
-  cargoHash = "sha256-no5M/Zxu5YQjI2HdxC/fU5YIq8L6iuSAvUQ4dHkA2r4=";
+  cargoHash = "sha256-1N45CNeawwcJ1jkkAViElqyCKD4VE7RZJWPQ9EnleGw=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix
index ee92339b9a1fd..6514cec7fc1a6 100644
--- a/pkgs/by-name/sc/scenefx/package.nix
+++ b/pkgs/by-name/sc/scenefx/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   meson,
   ninja,
-  wlroots,
+  wlroots_0_17,
   scdoc,
   pkg-config,
   wayland,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     wayland
     wayland-protocols
-    wlroots
+    wlroots_0_17
   ];
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix
index d9f127a1c953b..47b6e2c16c16e 100644
--- a/pkgs/by-name/se/selenium-manager/package.nix
+++ b/pkgs/by-name/se/selenium-manager/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     description = "Browser automation framework and ecosystem";
     homepage = "https://github.com/SeleniumHQ/selenium";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "selenium-manager";
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 91b050403a016..56bdcfd4937ac 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sketchybar-app-font";
-  version = "2.0.19";
+  version = "2.0.20";
 
   src = fetchFromGitHub {
     owner = "kvndrsslr";
     repo = "sketchybar-app-font";
-    rev = "v2.0.19";
-    hash = "sha256-4D3ONeGSvFYdeD3alzXlDxyLh6EyIC+lr4A6t7YWBaw=";
+    rev = "v2.0.20";
+    hash = "sha256-vWOVPllygKFeJe3aDOnXKdfIq9foL2V/sr1kj4VBhbc=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/sk/skypeexport/package.nix b/pkgs/by-name/sk/skypeexport/package.nix
index dffa1e4d7cc18..c8af575c78957 100644
--- a/pkgs/by-name/sk/skypeexport/package.nix
+++ b/pkgs/by-name/sk/skypeexport/package.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Temptin/SkypeExport";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix
index fe832ae334176..8f24c5c58b625 100644
--- a/pkgs/by-name/sk/skypilot/package.nix
+++ b/pkgs/by-name/sk/skypilot/package.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "skypilot";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "skypilot-org";
     repo = "skypilot";
-    rev = "v${version}";
-    hash = "sha256-SddXouful2RSp7ijx6YLzfBhBvzN9xKM2dRzivgNflw==";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZrNI9s7U39SMHqIzOtyuth8Wrkn+T2KSsMfpqO1pxoI=";
   };
 
   pyproject = true;
diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix
new file mode 100644
index 0000000000000..f7aefdb968e7a
--- /dev/null
+++ b/pkgs/by-name/sr/sratoolkit/package.nix
@@ -0,0 +1,57 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  python3,
+  bison,
+  flex,
+  libxml2,
+  openjdk,
+  ncbi-vdb,
+  mbedtls,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sratoolkit";
+
+  # NOTE: When updating make sure to update ncbi-vdb as well for versions to match
+  version = "3.1.1";
+
+  src = fetchFromGitHub {
+    owner = "ncbi";
+    repo = "sra-tools";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-WVPiAz3EFYuhBnl7BsEjJ2BTi1wAownEunVM4sdLaj8=";
+  };
+
+  cmakeFlags = [
+    "-DVDB_INCDIR=${ncbi-vdb}/include"
+    "-DVDB_LIBDIR=${ncbi-vdb}/lib"
+  ];
+
+  buildInputs = [
+    ncbi-vdb
+    libxml2
+    mbedtls
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    python3
+    bison
+    flex
+    openjdk
+  ];
+
+  meta = {
+    homepage = "https://github.com/ncbi/sra-tools";
+    description = "Collection of tools and libraries for using data in the INSDC Sequence Read Archives";
+    license = lib.licenses.ncbiPd;
+    maintainers = with lib.maintainers; [
+      thyol
+      t4ccer
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
index a3be748793688..b50cfbd38ac2c 100644
--- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
+++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
@@ -53,8 +53,14 @@ buildGoModule rec {
   doCheck = true;
   checkFlags = [ "-skip=TestSetSessionHandlers" ];
 
+  # The AWS CLI is expecting the binary name to be 'session-manager-plugin' and
+  # since the outfile is different the following workaround is renaming the binary.
+  postBuild = ''
+    mv $GOPATH/bin/sessionmanagerplugin-main $GOPATH/bin/${meta.mainProgram}
+  '';
+
   preCheck = ''
-    if ! [[ $($GOPATH/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then
+    if ! [[ $($GOPATH/bin/${meta.mainProgram} --version) = ${lib.escapeShellArg version} ]]; then
       echo 'wrong version'
       exit 1
     fi
diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index c1e2454a73f8b..05c46f784ad7c 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -8,7 +8,7 @@
   testers,
 }:
 let
-  version = "0.5.0";
+  version = "0.5.1";
 in
 rustPlatform.buildRustPackage {
   pname = "stu";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
     owner = "lusingander";
     repo = "stu";
     rev = "v${version}";
-    hash = "sha256-VETEcRuJk0cCWB5y8IRdycKcKb3uiAWOyjeZWCJykG4=";
+    hash = "sha256-JLsUMZDXK89QmHLlGG9i5L+1e/redjk5ff6NiZdNsYo=";
   };
 
-  cargoHash = "sha256-s2QvRberSz4egVO8A2h3cx8oUlZM1bV5qZ0U4EiuPRs=";
+  cargoHash = "sha256-1sAK+F0Wghz2X78OzYJ3QN+5sdpNQw/pxHof0IoJPQo=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.AppKit
diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix
index fbb086c540af7..55d4c774a2e76 100644
--- a/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/pkgs/by-name/sv/svelte-language-server/package.nix
@@ -29,6 +29,6 @@ in buildNpmPackage {
     homepage = "https://github.com/sveltejs/language-tools";
     license = lib.licenses.mit;
     mainProgram = "svelteserver";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index b90220a7c1ff4..1edc6d3d4cb96 100644
--- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix
@@ -25,7 +25,7 @@
   scenefx,
   wayland-scanner,
   xcbutilwm,
-  wlroots,
+  wlroots_0_17,
   testers,
   nixosTests,
   # Used by the NixOS module:
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     scenefx
     wayland
     wayland-protocols
-    (wlroots.override { inherit (finalAttrs) enableXWayland; })
+    (wlroots_0_17.override { inherit (finalAttrs) enableXWayland; })
   ] ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];
 
   mesonFlags =
diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 20b099e47ad02..9292cd1677006 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/mozilla-services/syncstorage-rs";
     changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${version}";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "syncserver";
   };
diff --git a/pkgs/by-name/sy/syndicate_utils/lock.json b/pkgs/by-name/sy/syndicate_utils/lock.json
index 4c58bce17c8fd..3ffb3c36c33d6 100644
--- a/pkgs/by-name/sy/syndicate_utils/lock.json
+++ b/pkgs/by-name/sy/syndicate_utils/lock.json
@@ -1,5 +1,27 @@
 {
   "depends": [
+    {
+      "method": "fetchzip",
+      "packages": [
+        "cps"
+      ],
+      "path": "/nix/store/8gbhwni0akqskdb3qhn5nfgv6gkdz0vz-source",
+      "rev": "c90530ac57f98a842b7be969115c6ef08bdcc564",
+      "sha256": "0h8ghs2fqg68j3jdcg7grnxssmllmgg99kym2w0a3vlwca1zvr62",
+      "srcDir": "",
+      "url": "https://github.com/ehmry/cps/archive/c90530ac57f98a842b7be969115c6ef08bdcc564.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "getdns"
+      ],
+      "path": "/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source",
+      "rev": "c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6",
+      "sha256": "1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b",
+      "srcDir": "src",
+      "url": "https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz"
+    },
     {
       "method": "fetchzip",
       "packages": [
@@ -14,62 +36,107 @@
     {
       "method": "fetchzip",
       "packages": [
-        "illwill"
+        "preserves"
       ],
-      "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source",
-      "ref": "v0.3.2",
-      "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625",
-      "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z",
-      "srcDir": "",
-      "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz"
+      "path": "/nix/store/hzb7af7lbd4kgd5y4hbgxv1lswig36yj-source",
+      "rev": "fd498c6457cb9ad2f3179daa40da69eec00326dd",
+      "sha256": "182xvw04vjw83mlcrkwkip29b44h0v8dapg2014k9011h90mdsj4",
+      "srcDir": "src",
+      "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/fd498c6457cb9ad2f3179daa40da69eec00326dd.tar.gz"
     },
     {
       "method": "fetchzip",
       "packages": [
-        "nimcrypto"
+        "stew"
       ],
-      "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source",
-      "ref": "traditional-api",
-      "rev": "602c5d20c69c76137201b5d41f788f72afb95aa8",
-      "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65",
+      "path": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source",
+      "rev": "3c91b8694e15137a81ec7db37c6c58194ec94a6a",
+      "sha256": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w",
       "srcDir": "",
-      "url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz"
+      "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz"
     },
     {
       "method": "fetchzip",
       "packages": [
-        "npeg"
+        "syndicate"
       ],
-      "path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source",
-      "ref": "1.2.1",
-      "rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09",
-      "sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh",
+      "path": "/nix/store/dw30cq9gxz3353zgaq4a36ajq6chvbwc-source",
+      "rev": "3a4dc1f13392830b587138199643d30fdbec8541",
+      "sha256": "1mbd17rjm1fsx7d0ckzyjih2nzdjqs52ck9wscqcg9nvf3ib5mvh",
       "srcDir": "src",
-      "url": "https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"
+      "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/3a4dc1f13392830b587138199643d30fdbec8541.tar.gz"
     },
     {
       "method": "fetchzip",
       "packages": [
-        "preserves"
+        "sys"
       ],
-      "path": "/nix/store/fmb2yckksz7iv3qdkk5gk1j060kppkq9-source",
-      "ref": "20231102",
-      "rev": "4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0",
-      "sha256": "1a3g5bk1l1h250q3p6sqv6r1lpsplp330qqyp48r0i4a5r0jksq3",
+      "path": "/nix/store/syhxsjlsdqfap0hk4qp3s6kayk8cqknd-source",
+      "rev": "4ef3b624db86e331ba334e705c1aa235d55b05e1",
+      "sha256": "1q4qgw4an4mmmcbx48l6xk1jig1vc8p9cq9dbx39kpnb0890j32q",
       "srcDir": "src",
-      "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0.tar.gz"
+      "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz"
     },
     {
       "method": "fetchzip",
       "packages": [
-        "syndicate"
+        "taps"
+      ],
+      "path": "/nix/store/6y14ia52kr7jyaa0izx37mlablmq9s65-source",
+      "rev": "8c8572cd971d1283e6621006b310993c632da247",
+      "sha256": "1dp166bv9x773jmfqppg5i3v3rilgff013vb11yzwcid9l7s3iy8",
+      "srcDir": "src",
+      "url": "https://git.sr.ht/~ehmry/nim_taps/archive/8c8572cd971d1283e6621006b310993c632da247.tar.gz"
+    },
+    {
+      "date": "2024-04-02T15:38:57+01:00",
+      "deepClone": false,
+      "fetchLFS": false,
+      "fetchSubmodules": true,
+      "hash": "sha256-iZb9aAgYr4FGkqfIg49QWiCqeizIi047kFhugHiP8o0=",
+      "leaveDotGit": false,
+      "method": "git",
+      "packages": [
+        "solo5_dispatcher"
+      ],
+      "path": "/nix/store/sf5dgj2ljvahcm6my7d61ibda51vnrii-solo5_dispatcher",
+      "rev": "a7a894a96a2221284012800e6fd32923d83d20bd",
+      "sha256": "13gjixw80vjqj0xlx2y85ixal82sa27q7j57j9383bqq11lgv5l9",
+      "srcDir": "pkg",
+      "url": "https://git.sr.ht/~ehmry/solo5_dispatcher"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "bigints"
+      ],
+      "path": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source",
+      "rev": "86ea14d31eea9275e1408ca34e6bfe9c99989a96",
+      "sha256": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4",
+      "srcDir": "src",
+      "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "nimcrypto"
+      ],
+      "path": "/nix/store/h7lgq3by9mx8in03vzh0y964lnnlkalp-source",
+      "rev": "ff6afc6a753bd645cad4568472c7733d1715e31e",
+      "sha256": "0h9vpayp66pg66114bl0nsvlv1nzp7f0x5b35gbsbd7svzlcz5zj",
+      "srcDir": "",
+      "url": "https://github.com/cheatfate/nimcrypto/archive/ff6afc6a753bd645cad4568472c7733d1715e31e.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "npeg"
       ],
-      "path": "/nix/store/nhpvl223vbzdrlzikw7pgyfxs344w7ma-source",
-      "ref": "20231108",
-      "rev": "095418032180e360ea27ec7fcd63193944b68e2c",
-      "sha256": "09pbml2chzz0v5zpz67fs7raj0mfmg8qrih2vz85xxc51h7ncqvw",
+      "path": "/nix/store/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source",
+      "rev": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d",
+      "sha256": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg",
       "srcDir": "src",
-      "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/095418032180e360ea27ec7fcd63193944b68e2c.tar.gz"
+      "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz"
     }
   ]
 }
diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix
index a467c3925fdc9..943b5ab4e8278 100644
--- a/pkgs/by-name/sy/syndicate_utils/package.nix
+++ b/pkgs/by-name/sy/syndicate_utils/package.nix
@@ -1,17 +1,35 @@
-{ lib, buildNimPackage, fetchFromGitea }:
+{
+  lib,
+  buildNimPackage,
+  fetchFromGitea,
+  libxml2,
+  libxslt,
+  openssl,
+  pkg-config,
+  postgresql,
+  sqlite,
+}:
 
 buildNimPackage (finalAttrs: {
   pname = "syndicate_utils";
-  version = "20231130";
+  version = "20240509";
 
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "syndicate_utils";
     rev = finalAttrs.version;
-    hash = "sha256-a9EjHSrLyWoP4qUQM+fRjZrNavQfT+SUO44pnPK1j/Q=";
+    hash = "sha256-Sy6Ad0nNr/0y5W4z3SzlwfsA8hiXzlOPDOGdwbCYROs=";
   };
 
+  buildInputs = [
+    postgresql.out
+    sqlite
+    libxml2
+    libxslt
+    openssl
+  ];
+
   lockFile = ./lock.json;
 
   meta = finalAttrs.src.meta // {
diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index c8f45f834a671..87e556dbabaa2 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -61,13 +61,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "syslog-ng";
-  version = "4.7.1";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "syslog-ng";
     repo = "syslog-ng";
     rev = "syslog-ng-${finalAttrs.version}";
-    hash = "sha256-runFMUxQv7B023I38QfGqn89ZbzA5vMXHOOkYwMxArI=";
+    hash = "sha256-sfCElufK80BU8I6pbdCJ+IlAPhSOt9MOYDy3E2hg5/A=";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl gperf python3Packages.setuptools ];
diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
new file mode 100644
index 0000000000000..f0ddde526f0bc
--- /dev/null
+++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
@@ -0,0 +1,28 @@
+{ lib
+, tailscale
+, buildGoModule
+}:
+
+buildGoModule {
+  inherit (tailscale) version src vendorHash CGO_ENABLED;
+  pname = "tailscale-gitops-pusher";
+
+  subPackages = [
+    "cmd/gitops-pusher"
+  ];
+
+  ldflags = [
+    "-w"
+    "-s"
+    "-X tailscale.com/version.longStamp=${tailscale.version}"
+    "-X tailscale.com/version.shortStamp=${tailscale.version}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://tailscale.com";
+    description = "Allows users to use a GitOps flow for managing Tailscale ACLs";
+    license = licenses.bsd3;
+    mainProgram = "gitops-pusher";
+    maintainers = with maintainers; [ xanderio ];
+  };
+}
diff --git a/pkgs/by-name/th/themix-gui/package.nix b/pkgs/by-name/th/themix-gui/package.nix
index 8393884cb5c2c..a70c576cac756 100644
--- a/pkgs/by-name/th/themix-gui/package.nix
+++ b/pkgs/by-name/th/themix-gui/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/themix-project/themix-gui";
     license = lib.licenses.gpl3Only;
     mainProgram = "themix-gui";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix
index c2e3de8628a55..ec737de3e5571 100644
--- a/pkgs/by-name/ti/tiny-dfr/package.nix
+++ b/pkgs/by-name/ti/tiny-dfr/package.nix
@@ -2,18 +2,18 @@
 , cairo, gdk-pixbuf, glib, libinput, libxml2, pango, udev
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "tiny-dfr";
-  version = "0.3.0-unstable-2024-07-10";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "WhatAmISupposedToPutHere";
     repo = "tiny-dfr";
-    rev = "a066ded870d8184db81f16b4b55d0954b2ab4c88";
-    hash = "sha256-++TezIILx5FXJzIxVfxwNTjZiGGjcZyih2KBKwD6/tU=";
+    rev = "v${version}";
+    hash = "sha256-0nopB2gCa80hwXoEaVuGhPOncLFA/u5XydCSPiCDUlg=";
   };
 
-  cargoHash = "sha256-q0yx4QT6L1G+5PvstXjA4aa0kZPhQTpM8h69dd/1Mcw=";
+  cargoHash = "sha256-w3trbTbRfHNekQ+mKHsq8O29S33QsdTdBawxDm3+Szs=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ];
diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix
index 72535c57fb4ea..ce14065456d84 100644
--- a/pkgs/by-name/ti/tio/package.nix
+++ b/pkgs/by-name/ti/tio/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Serial console TTY";
     homepage = "https://tio.github.io/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tio";
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix
index 247f345bd7b18..4faeff53e3783 100644
--- a/pkgs/by-name/tl/tlrc/package.nix
+++ b/pkgs/by-name/tl/tlrc/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tlrc";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "tldr-pages";
     repo = "tlrc";
     rev = "v${version}";
-    hash = "sha256-JQx4vuXbsLrPAbmPlwPiPXJIpRufUzQN+R+Wqj4H8n4=";
+    hash = "sha256-3KS/KN6/RO+PxoxbCVryymnTyWcmfXuCoc9E+asdU/E=";
   };
 
-  cargoHash = "sha256-5caZTdpEog8xdCn+LOfW5UdbuWZmO8iggSstxvdjwb0=";
+  cargoHash = "sha256-9MnYSmMhLn31aHwooo8W/1Rp7N5P6Tar7Ft2iXRVnh0=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/tr/trrntzip/package.nix b/pkgs/by-name/tr/trrntzip/package.nix
index baa671ce217ce..633de93797adb 100644
--- a/pkgs/by-name/tr/trrntzip/package.nix
+++ b/pkgs/by-name/tr/trrntzip/package.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
       gpl2Plus
     ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ TheBrainScrambler ];
+    maintainers = with maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 669cbd123a5aa..2ec573bbe5459 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -2,18 +2,25 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  makeBinaryWrapper,
   meson,
   ninja,
   scdoc,
   pkg-config,
   nix-update-script,
+  bash,
   dmenu,
   libnotify,
+  newt,
   python3Packages,
   util-linux,
+  hyprland,
+  sway,
   fumonSupport ? true,
   uuctlSupport ? true,
   uwsmAppSupport ? true,
+  hyprlandSupport ? false,
+  swaySupport ? false,
 }:
 let
   python = python3Packages.python.withPackages (ps: [
@@ -24,29 +31,31 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.17.0";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-M2j7l5XTSS2IzaJofAHct1tuAO2A9Ps9mCgAWKEvzoE=";
+    hash = "sha256-7RPz0VOUJ4fFhxNq+/s+/YEvy03XXgssggPn/JtOZI4=";
   };
 
   nativeBuildInputs = [
+    makeBinaryWrapper
     meson
     ninja
     pkg-config
     scdoc
   ];
 
-  buildInputs = [
-    libnotify
-    util-linux
+  propagatedBuildInputs = [
+    util-linux # waitpid
+    newt # whiptail
+    libnotify # notify
+    bash # sh
+    python
   ] ++ (lib.optionals uuctlSupport [ dmenu ]);
 
-  propagatedBuildInputs = [ python ];
-
   mesonFlags = [
     "--prefix=${placeholder "out"}"
     (lib.mapAttrsToList lib.mesonEnable {
@@ -61,11 +70,41 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
+  postInstall =
+    let
+      wrapperArgs = ''
+        --prefix PATH : "${lib.makeBinPath finalAttrs.propagatedBuildInputs}" \
+        --suffix PATH : "${
+          lib.makeBinPath (
+            # uwsm as of 0.17.2 can load WMs like sway and hyprland by path
+            # but this is still needed as a fallback
+            lib.optionals hyprlandSupport [ hyprland ] ++ lib.optionals swaySupport [ sway ]
+          )
+        }"
+      '';
+    in
+    ''
+      wrapProgram $out/bin/uwsm ${wrapperArgs}
+      ${lib.optionalString uuctlSupport ''
+        wrapProgram $out/bin/uuctl ${wrapperArgs}
+      ''}
+      ${lib.optionalString uwsmAppSupport ''
+        wrapProgram $out/bin/uwsm-app ${wrapperArgs}
+      ''}
+      ${lib.optionalString fumonSupport ''
+        wrapProgram $out/bin/fumon ${wrapperArgs}
+      ''}
+    '';
+
   meta = {
     description = "Universal wayland session manager";
     homepage = "https://github.com/Vladimir-csp/uwsm";
+    mainProgram = "uwsm";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ johnrtitor ];
+    maintainers = with lib.maintainers; [
+      johnrtitor
+      kai-tub
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 74e16ebf8465c..f92719cb0cc71 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -27,6 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --replace-fail "arm-linux-gnueabihf-as"  "armv7l-unknown-linux-gnueabihf-as" \
       --replace-fail "arm-linux-gnueabihf-gcc" "armv7l-unknown-linux-gnueabihf-gcc" \
       --replace-fail "arm-linux-gnueabihf-g++" "armv7l-unknown-linux-gnueabihf-g++"
+    # If we don’t turn this off, then you won’t be able to run binaries that
+    # are installed by vcpkg.
+    find triplets -name '*linux*.cmake' -exec bash -c 'echo "set(X_VCPKG_RPATH_KEEP_SYSTEM_PATHS ON)" >> "$1"' -- {} \;
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix
index 848a23919519a..15fbab6fdbeea 100644
--- a/pkgs/by-name/vv/vvvvvv/package.nix
+++ b/pkgs/by-name/vv/vvvvvv/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     homepage = "https://thelettervsixtim.es";
     changelog = "https://github.com/TerryCavanagh/VVVVVV/releases/tag/${src.rev}";
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 02b5f797cc4dd..9862909bf5757 100644
--- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
@@ -34,13 +34,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
   stdenvNoCC.mkDerivation
   (finalAttrs: {
     pname = "where-is-my-sddm-theme";
-    version = "1.10.0";
+    version = "1.11.0";
 
     src = fetchFromGitHub {
       owner = "stepanzubkov";
       repo = "where-is-my-sddm-theme";
       rev = "refs/tags/v${finalAttrs.version}";
-      hash = "sha256-hv0s2ZnfLE3DJ60G6ZL/Z+sXth9plzjlUNwII8TMuOo=";
+      hash = "sha256-EzO+MTz1PMmgeKyw65aasetmjUCpvilcvePt6HJZrpo=";
     };
 
     propagatedUserEnvPkgs =
diff --git a/pkgs/by-name/xe/xevd/package.nix b/pkgs/by-name/xe/xevd/package.nix
index c25e5b6029c20..64e5a70d0e7e7 100644
--- a/pkgs/by-name/xe/xevd/package.nix
+++ b/pkgs/by-name/xe/xevd/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   stdenv,
   gitUpdater,
   testers,
@@ -18,6 +19,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Dc2V77t+DrZo9252FAL0eczrmikrseU02ob2RLBdVvU=";
   };
 
+  patches = lib.optionals (!lib.versionOlder "0.5.0" finalAttrs.version) [
+    (fetchpatch2 {
+      url = "https://github.com/mpeg5/xevd/commit/7eda92a6ebb622189450f7b63cfd4dcd32fd6dff.patch?full_index=1";
+      hash = "sha256-Ru7jGk1b+Id5x1zaiGb7YKZGTNaTcArZGYyHbJURfgs=";
+    })
+  ];
+
   postPatch = ''
     echo v$version > version.txt
   '';
@@ -34,8 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-lm" ];
-
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
diff --git a/pkgs/by-name/xe/xeve/package.nix b/pkgs/by-name/xe/xeve/package.nix
index f8d44b4a2f1dd..0788061df4169 100644
--- a/pkgs/by-name/xe/xeve/package.nix
+++ b/pkgs/by-name/xe/xeve/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   gitUpdater,
   stdenv,
   cmake,
@@ -17,6 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8jXntm/yFme9ZPImdW54jAr11hEsU1K+N5/7RLmITPs=";
   };
 
+  patches = lib.optionals (!lib.versionOlder "0.5.0" finalAttrs.version) [
+    (fetchpatch2 {
+      url = "https://github.com/mpeg5/xeve/commit/954ed6e0494cd2438fd15c717c0146e88e582b33.patch?full_index=1";
+      hash = "sha256-//NtOUm1fqPFvOM955N6gF+QgmOdmuVunwx/3s/G/J8=";
+    })
+  ];
+
   postPatch = ''
     echo v$version > version.txt
   '';
@@ -27,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     ln $dev/include/xeve/* $dev/include/
   '';
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-lm" ];
-
   outputs = [
     "out"
     "lib"
diff --git a/pkgs/tools/misc/xilinx-bootgen/default.nix b/pkgs/by-name/xi/xilinx-bootgen/package.nix
similarity index 67%
rename from pkgs/tools/misc/xilinx-bootgen/default.nix
rename to pkgs/by-name/xi/xilinx-bootgen/package.nix
index 1eece16d35111..9190d87986a1c 100644
--- a/pkgs/tools/misc/xilinx-bootgen/default.nix
+++ b/pkgs/by-name/xi/xilinx-bootgen/package.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, openssl }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  openssl,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xilinx-bootgen";
-  version = "xilinx_v2023.2";
+  version = "xilinx_v2024.1";
 
   src = fetchFromGitHub {
     owner = "xilinx";
     repo = "bootgen";
-    rev = version;
-    hash = "sha256-YRaq36N6uBHyjuHQ5hCO35Y+y818NuSjg/js181iItA=";
+    rev = finalAttrs.version;
+    hash = "sha256-/gNAqjwfaD2NWxs2536XGv8g2IyRcQRHzgLcnCr4a34=";
   };
 
   buildInputs = [ openssl ];
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
     install -Dm755 bootgen $out/bin/bootgen
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Generate Boot Images for Xilinx Zynq and ZU+ SoCs";
     longDescription = ''
       Bootgen for Xilinx Zynq and ZU+ SoCs, without code related to generating
@@ -30,9 +35,9 @@ stdenv.mkDerivation rec {
       For more details about Bootgen, please refer to Xilinx UG1283.
     '';
     homepage = "https://github.com/Xilinx/bootgen";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.flokli ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.flokli lib.maintainers.jmbaur ];
     mainProgram = "bootgen";
   };
-}
+})
diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock
index 35a55b81023db..738ab3da1c3ae 100644
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -378,6 +378,7 @@ dependencies = [
  "cargo_toml",
  "chrono",
  "client",
+ "clock",
  "collections",
  "command_palette_hooks",
  "ctor",
@@ -420,6 +421,7 @@ dependencies = [
  "telemetry_events",
  "terminal",
  "terminal_view",
+ "text",
  "theme",
  "tiktoken-rs",
  "toml 0.8.10",
@@ -2405,22 +2407,13 @@ dependencies = [
  "worktree",
 ]
 
-[[package]]
-name = "clipboard-win"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342"
-dependencies = [
- "lazy-bytes-cast",
- "winapi",
-]
-
 [[package]]
 name = "clock"
 version = "0.1.0"
 dependencies = [
  "chrono",
  "parking_lot",
+ "serde",
  "smallvec",
 ]
 
@@ -2479,6 +2472,7 @@ version = "0.44.0"
 dependencies = [
  "anthropic",
  "anyhow",
+ "assistant",
  "async-trait",
  "async-tungstenite",
  "audio",
@@ -3408,11 +3402,13 @@ dependencies = [
  "ctor",
  "editor",
  "env_logger",
+ "feature_flags",
  "futures 0.3.28",
  "gpui",
  "language",
  "log",
  "lsp",
+ "multi_buffer",
  "pretty_assertions",
  "project",
  "rand 0.8.5",
@@ -3617,6 +3613,7 @@ dependencies = [
  "linkify",
  "log",
  "lsp",
+ "markdown",
  "multi_buffer",
  "ordered-float 2.10.0",
  "parking_lot",
@@ -3990,6 +3987,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
+ "collections",
  "db",
  "editor",
  "extension",
@@ -4009,6 +4007,7 @@ dependencies = [
  "theme_selector",
  "ui",
  "util",
+ "vim",
  "workspace",
 ]
 
@@ -4879,7 +4878,6 @@ dependencies = [
  "calloop",
  "calloop-wayland-source",
  "cbindgen",
- "clipboard-win",
  "cocoa",
  "collections",
  "core-foundation",
@@ -5071,6 +5069,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
+ "extension",
  "fs",
  "futures 0.3.28",
  "gpui",
@@ -6084,12 +6083,6 @@ dependencies = [
  "workspace",
 ]
 
-[[package]]
-name = "lazy-bytes-cast"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -8085,6 +8078,7 @@ dependencies = [
  "serde_json",
  "settings",
  "sha2 0.10.7",
+ "shellexpand 2.1.2",
  "shlex",
  "similar",
  "smol",
@@ -8226,6 +8220,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
+ "futures 0.3.28",
  "prost",
  "prost-build",
  "serde",
@@ -8317,10 +8312,13 @@ dependencies = [
  "assistant",
  "editor",
  "gpui",
+ "repl",
  "search",
  "settings",
  "ui",
+ "util",
  "workspace",
+ "zed_actions",
 ]
 
 [[package]]
@@ -8527,7 +8525,6 @@ dependencies = [
  "client",
  "dev_server_projects",
  "editor",
- "feature_flags",
  "fuzzy",
  "gpui",
  "language",
@@ -8705,6 +8702,7 @@ dependencies = [
  "image",
  "language",
  "log",
+ "multi_buffer",
  "project",
  "runtimelib",
  "schemars",
@@ -10777,6 +10775,7 @@ dependencies = [
  "gpui",
  "libc",
  "rand 0.8.5",
+ "release_channel",
  "schemars",
  "serde",
  "serde_derive",
@@ -13337,6 +13336,7 @@ dependencies = [
  "derive_more",
  "dev_server_projects",
  "env_logger",
+ "file_icons",
  "fs",
  "futures 0.3.28",
  "gpui",
@@ -13628,7 +13628,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.144.4"
+version = "0.145.1"
 dependencies = [
  "activity_indicator",
  "anyhow",
@@ -13756,7 +13756,7 @@ dependencies = [
 
 [[package]]
 name = "zed_dart"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13770,7 +13770,7 @@ dependencies = [
 
 [[package]]
 name = "zed_elixir"
-version = "0.0.5"
+version = "0.0.6"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13870,9 +13870,9 @@ dependencies = [
 
 [[package]]
 name = "zed_php"
-version = "0.0.6"
+version = "0.1.1"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13906,7 +13906,7 @@ dependencies = [
 
 [[package]]
 name = "zed_svelte"
-version = "0.0.1"
+version = "0.0.3"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13948,9 +13948,9 @@ dependencies = [
 
 [[package]]
 name = "zed_zig"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
- "zed_extension_api 0.0.7",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index b85496958f302..b6d8cd3ec00b7 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
 
 rustPlatform.buildRustPackage rec {
   pname = "zed";
-  version = "0.144.4";
+  version = "0.145.1";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-F/44NjoBCH2und9VVayE0wxrrOtcFoP5yuvxgxCkxuM=";
+    hash = "sha256-fO1VT2LiZa9XkQxP7QcEG9uCTtEm3soces7FCFwosbU=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index 83efef0ab9b68..cd0344afb3592 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
     description = "truetype monospaced typeface designed for X environments";
     homepage = "https://b.agaric.net/page/agave";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix
index bf56f5abc0f92..891e0e3c0e0a7 100644
--- a/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/pkgs/data/fonts/ankacoder/condensed.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Anka/Coder Condensed font";
     homepage = "https://code.google.com/archive/p/anka-coder-fonts";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix
index 8497cbdee3fd0..12a953f72dcab 100644
--- a/pkgs/data/fonts/ankacoder/default.nix
+++ b/pkgs/data/fonts/ankacoder/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Anka/Coder fonts";
     homepage = "https://code.google.com/archive/p/anka-coder-fonts";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index e1c18695db1ef..4dc5cc2d73344 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     description = "Default typeface used in the user interface of GNOME since version 3.0";
     platforms = lib.platforms.all;
     license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix
index 8bdfb6f94f6eb..c69bb0715dc67 100644
--- a/pkgs/data/fonts/cherry/default.nix
+++ b/pkgs/data/fonts/cherry/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "cherry font";
     homepage = "https://github.com/turquoise-hexagon/cherry";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix
index 2c48756413fac..fa4938798edc6 100644
--- a/pkgs/data/fonts/creep/default.nix
+++ b/pkgs/data/fonts/creep/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/romeovs/creep";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix
index e5b6a59af4887..867345c3a8565 100644
--- a/pkgs/data/fonts/d2coding/default.nix
+++ b/pkgs/data/fonts/d2coding/default.nix
@@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/naver/d2codingfont";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index c9541b307ff08..5247e9e6d8823 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
   meta = with lib; {
     homepage = "https://software.sil.org/gentium/";
     description = "High-quality typeface family for Latin, Cyrillic, and Greek";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.ofl;
     platforms = platforms.all;
   };
diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix
index ce69b0080908b..8a0e5479f188b 100644
--- a/pkgs/data/fonts/hermit/default.nix
+++ b/pkgs/data/fonts/hermit/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     description = "monospace font designed to be clear, pragmatic and very readable";
     homepage = "https://pcaro.es/p/hermit";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix
index 4ca067360520e..10d820bf5f7f2 100644
--- a/pkgs/data/fonts/last-resort/default.nix
+++ b/pkgs/data/fonts/last-resort/default.nix
@@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Fallback font of last resort";
     homepage = "https://github.com/unicode-org/last-resort-font";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix
index 09d07a2a1d0ca..e268f559df0c4 100644
--- a/pkgs/data/fonts/luculent/default.nix
+++ b/pkgs/data/fonts/luculent/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     description = "luculent font";
     homepage = "http://www.eastfarthing.com/luculent/";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix
index 90982efbc8090..1bde4e869214a 100644
--- a/pkgs/data/fonts/manrope/default.nix
+++ b/pkgs/data/fonts/manrope/default.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://www.gent.media/manrope";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index 0712248dc5aca..e0dc649bc7217 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Customized version of Apple’s Menlo-Regular font";
     homepage = "https://github.com/andreberg/Meslo-Font/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; all;
   };
 }
diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix
index 74741f6a7d2dc..f27f487bd6abd 100644
--- a/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix
@@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/naver/nanumfont";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix
index 0a1e320f7876a..eab325af54c56 100644
--- a/pkgs/data/fonts/national-park/default.nix
+++ b/pkgs/data/fonts/national-park/default.nix
@@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
     signs that are carved using a router bit'';
     homepage = "https://nationalparktypeface.com/";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index 45a8540d080db..7a8538c027d2b 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://public-sans.digital.gov/";
     changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix
index df0f867b7a929..dcfe0c789b00c 100644
--- a/pkgs/data/fonts/redhat-official/default.nix
+++ b/pkgs/data/fonts/redhat-official/default.nix
@@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index c5edbc5051c39..48b920a576bd3 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Monospaced bitmap fonts";
     homepage = "https://www.cambus.net/spleen-monospaced-bitmap-fonts";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index a69c947ce4498..49df566c18710 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://www.kutilek.de/sudo-font/";
     changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix
index eb6d139b33a9c..6591fa0d32d0a 100644
--- a/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/pkgs/data/fonts/terminus-font-ttf/default.nix
@@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://files.ax86.net/terminus-ttf";
     license = licenses.ofl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
index c0ec9ee75202c..a93beaccb0714 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -28,7 +28,7 @@ let
       # which is a free license, legally equivalent to the LaTeX Project Public
       # License (LPPL), version 1.3c or later." - GUST website
       license = licenses.lppl13c;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       platforms = platforms.all;
     };
   };
diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/data/fonts/times-newer-roman/default.nix
index 6f856558cb4ab..a12ba2cbe3574 100644
--- a/pkgs/data/fonts/times-newer-roman/default.nix
+++ b/pkgs/data/fonts/times-newer-roman/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation {
     description = "Font that looks just like Times New Roman, except each character is 5-10% wider";
     homepage = "https://timesnewerroman.com/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix
index 9907b18203d7a..d8d36e6a8ee37 100644
--- a/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix
@@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation rec  {
     license = with licenses; [ gpl3Only ];
     # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index bcfbc579da25d..23253eef72c2f 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Style neutral scalable cursor theme";
     platforms = platforms.all;
     license = licenses.cc-by-sa-30;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix
index 954328c8d49db..716fe1d060171 100644
--- a/pkgs/data/misc/fedora-backgrounds/generic.nix
+++ b/pkgs/data/misc/fedora-backgrounds/generic.nix
@@ -43,6 +43,6 @@ stdenvNoCC.mkDerivation {
     description = "Set of default and supplemental wallpapers for Fedora";
     license = licenses.cc-by-sa-40;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix
index 75c7075bae9fd..89af4e552e1cf 100644
--- a/pkgs/data/misc/nixos-artwork/icons.nix
+++ b/pkgs/data/misc/nixos-artwork/icons.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Icons of the Nix logo, in Freedesktop Icon Directory Layout";
     homepage = "https://github.com/NixOS/nixos-artwork";
     license = licenses.cc-by-40;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/data/soundfonts/generaluser/default.nix
index f8dd40cd88102..446fa606c1bc3 100644
--- a/pkgs/data/soundfonts/generaluser/default.nix
+++ b/pkgs/data/soundfonts/generaluser/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.schristiancollins.com/generaluser.php";
     license = licenses.generaluser;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix
index 34f35425410a5..79453cfbb4bb7 100644
--- a/pkgs/data/soundfonts/ydp-grand/default.nix
+++ b/pkgs/data/soundfonts/ydp-grand/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
     homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html";
     license = licenses.cc-by-30;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix
index fb3431cc139b6..4b47f6c2d3e36 100644
--- a/pkgs/data/themes/adementary/default.nix
+++ b/pkgs/data/themes/adementary/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme";
     homepage    = "https://github.com/hrdwrrsk/adementary-theme";
     license     = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
index 5e2f5e2592a41..7a7f151c382b9 100644
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     description = "Style to bend Qt applications to look like they belong into GNOME Shell";
     homepage = "https://github.com/FedoraQt/adwaita-qt";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix
index d596580d67edf..9d71e18f037fd 100644
--- a/pkgs/data/themes/gtk-theme-framework/default.nix
+++ b/pkgs/data/themes/gtk-theme-framework/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/jaxwilko/gtk-theme-framework";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix
index 1404a6ca86ec0..9c883b51340ee 100644
--- a/pkgs/data/themes/kde2/default.nix
+++ b/pkgs/data/themes/kde2/default.nix
@@ -25,6 +25,6 @@ mkDerivation rec {
     homepage = "https://github.com/repos-holder/kdecoration2-kde2";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix
index be8cb6439a48a..3a0246247e1f5 100644
--- a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix
+++ b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     description = "BGRT theme with a spinning NixOS logo";
     homepage = "https://github.com/helsinki-systems/plymouth-theme-nixos-bgrt";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix
index de2b92be05f2c..dd4c0281fa866 100644
--- a/pkgs/data/themes/pop-gtk/default.nix
+++ b/pkgs/data/themes/pop-gtk/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/pop-os/gtk-theme";
     license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index 980c7b3d1934f..35de0414b47e4 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-draw";
-  version = "6.0.5";
+  version = "7.0.2";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
+    hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98=";
   };
 
   postPatch = ''
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight drawing tool for users to freely draw and simply edit images";
     mainProgram = "deepin-draw";
     homepage = "https://github.com/linuxdeepin/deepin-draw";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }
diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
index c035a217171e6..3b775fb8bc642 100644
--- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
@@ -8,7 +8,6 @@
 , dtkwidget
 , qt5integration
 , dde-qt-dbus-factory
-, dde-dock
 , qtbase
 , qtmultimedia
 , qtx11extras
@@ -27,22 +26,27 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-screen-recorder";
-  version = "unstable-2023-07-10";
+  version = "6.0.6";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = "e8ee1e8330e2f3923e22acc952a0bd01bee94ad1";
-    hash = "sha256-QHV3hSALXI4e31YBDXRSRgT8b/J8gwm024bzlPWu2FA=";
+    rev = version;
+    hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";
   };
 
-  patches = [ ./dont_use_libPath.diff ];
+  patches = [
+    ./dont_use_libPath.diff
+  ];
 
+  # disable dock plugins, it's part of dde-shell now
   postPatch = ''
+    substituteInPlace screen_shot_recorder.pro \
+      --replace-fail " src/dde-dock-plugins" ""
     (
       shopt -s globstar
       substituteInPlace **/*.pro **/*.service **/*.desktop \
-        --replace "/usr/" "$out/"
+        --replace-quiet "/usr/" "$out/"
     )
   '';
 
@@ -56,7 +60,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     dtkwidget
     dde-qt-dbus-factory
-    dde-dock
     qtbase
     qtmultimedia
     qtx11extras
@@ -78,9 +81,6 @@ stdenv.mkDerivation rec {
     gst-plugins-good
   ]);
 
-  # Fix build failure on dtk 5.6.20
-  env.NIX_CFLAGS_COMPILE = "-std=c++14";
-
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
   qtWrapperArgs = [
     "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
@@ -91,11 +91,11 @@ stdenv.mkDerivation rec {
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Screen recorder application for dde";
     homepage = "https://github.com/linuxdeepin/deepin-screen-recorder";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
index 92e0bfe94d708..200ca9a63e5cc 100644
--- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
index 4ec00ee9f149e..f3026744ea6e8 100644
--- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "GNOME Shell extension adding audio device chooser to panel";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/valent/default.nix b/pkgs/desktops/gnome/extensions/valent/default.nix
index 1aa4799cd837e..87fa3accc74c1 100644
--- a/pkgs/desktops/gnome/extensions/valent/default.nix
+++ b/pkgs/desktops/gnome/extensions/valent/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://valent.andyholmes.ca/";
     changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
index 1ac4589b355a5..48d80545ecca5 100644
--- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
+++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "GNOME Shell extension showing a video preview on the corner of the screen";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://github.com/medenagan/window-corner-preview";
     broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
index 2e9864cb1da3a..10133b9bf3f83 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
@@ -41,7 +41,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "KWin script that automatically adds/removes virtual desktops";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (src.meta) homepage;
     inherit (kwindowsystem.meta) platforms;
   };
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
index c50a21f202ded..63ed7a86fe303 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
@@ -39,7 +39,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "Look at your windows and desktops from above";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (src.meta) homepage;
     inherit (kwindowsystem.meta) platforms;
   };
diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix
index 8e06e36db4649..1c68d6cf00315 100644
--- a/pkgs/desktops/surf-display/default.nix
+++ b/pkgs/desktops/surf-display/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Kiosk browser session manager based on the surf browser";
     mainProgram = "surf-display";
     homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
deleted file mode 100644
index 1097e7d3f81fb..0000000000000
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file is based on https://github.com/turboMaCk/bs-platform.nix/blob/master/build-bs-platform.nix
-# to make potential future updates simpler
-
-{ lib, stdenv, ninja, runCommand, nodejs, python3,
-  ocaml-version, version, src,
-  patches ? [],
-  ocaml ? (import ./ocaml.nix {
-    version = ocaml-version;
-    inherit lib stdenv;
-    src = "${src}/ocaml";
-  }),
-  custom-ninja ? (ninja.overrideAttrs (attrs: {
-    src = runCommand "ninja-patched-source" {} ''
-      mkdir -p $out
-      tar zxvf ${src}/vendor/ninja.tar.gz -C $out
-    '';
-    patches = [];
-  })),
-  ...
-}:
-
-let
-  bin_folder = if stdenv.isDarwin then "darwin" else "linux";
-in
-
-stdenv.mkDerivation rec {
-  inherit src version patches;
-  pname = "bs-platform";
-
-  BS_RELEASE_BUILD = "true";
-
-  # BuckleScript's idiosyncratic build process only builds artifacts required
-  # for editor-tooling to work when this environment variable is set:
-  # https://github.com/BuckleScript/bucklescript/blob/7.2.0/scripts/install.js#L225-L227
-  BS_TRAVIS_CI = "1";
-
-  buildInputs = [ nodejs python3 custom-ninja ];
-
-  prePatch = ''
-    sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js
-    mkdir -p ./native/${ocaml-version}/bin
-    ln -sf ${ocaml}/bin/*  ./native/${ocaml-version}/bin
-  '';
-
-  # avoid building the development version, will break aarch64 build
-  dontConfigure = true;
-
-  buildPhase = ''
-    # This is an unfortunate name, but it's actually how to build a release
-    # binary for BuckleScript
-    npm run postinstall
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out
-    mkdir -p $out/lib/ocaml
-    cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
-    cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
-    cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml
-    cp bsconfig.json package.json $out
-    ln -s $out/bsb $out/bin/bsb
-    ln -s $out/bsc $out/bin/bsc
-    ln -s $out/bsrefmt $out/bin/bsrefmt
-  '';
-}
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix
deleted file mode 100644
index a1b8ad550ac36..0000000000000
--- a/pkgs/development/compilers/bs-platform/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }:
-let
-  build-bs-platform = import ./build-bs-platform.nix;
-in
-(build-bs-platform rec {
-  inherit lib stdenv runCommand fetchFromGitHub ninja nodejs python3;
-  version = "8.2.0";
-  ocaml-version = "4.06.1";
-
-  patches = [ ./jscomp-release-ninja.patch ];
-
-  src = fetchFromGitHub {
-    owner = "BuckleScript";
-    repo = "bucklescript";
-    rev = version;
-    sha256 = "1hql7sxps1k17zmwyha6idq6nw20abpq770l55ry722birclmsmf";
-    fetchSubmodules = true;
-  };
-}).overrideAttrs (attrs: {
-  meta = with lib; {
-    description = "JavaScript backend for OCaml focused on smooth integration and clean generated code";
-    homepage = "https://bucklescript.github.io";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ turbomack gamb ];
-    platforms = platforms.all;
-  };
-})
diff --git a/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch b/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch
deleted file mode 100644
index 96235f921317d..0000000000000
--- a/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- jscomp/others/release.ninja | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja
-index 9ea6d11c5..a91ed9c80 100644
---- a/jscomp/others/release.ninja
-+++ b/jscomp/others/release.ninja
-@@ -30,7 +30,7 @@ build others/js_json.cmj : cc_cmi others/js_json.ml | others/js_array2.cmj other
- build others/js_json.cmi : cc others/js_json.mli | others/js_dict.cmi others/js_null.cmi others/js_string.cmj others/js_types.cmi runtime
- build others/js_list.cmj : cc_cmi others/js_list.ml | others/js_array2.cmj others/js_list.cmi others/js_vector.cmj runtime
- build others/js_list.cmi : cc others/js_list.mli | others/js_vector.cmi runtime
--build others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.ml | others/js_mapperRt.cmi runtime
-+build others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.ml | others/js_array2.cmj others/js_mapperRt.cmi runtime
- build others/js_mapperRt.cmi : cc others/js_mapperRt.mli | runtime
- build others/js_math.cmi others/js_math.cmj : cc others/js_math.ml | others/js_int.cmj runtime
- build others/js_null.cmj : cc_cmi others/js_null.ml | others/js_exn.cmj others/js_null.cmi runtime
\ No newline at end of file
diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix
deleted file mode 100644
index 206a3aff61cbf..0000000000000
--- a/pkgs/development/compilers/bs-platform/ocaml.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, stdenv, src, version }:
-stdenv.mkDerivation rec {
-  inherit src version;
-  pname = "ocaml-bs";
-  configurePhase = ''
-    ./configure -prefix $out
-  '';
-
-  # Workaround ocaml-4.06 limitation of duplicate definitions.
-  #   ld: libcamlrun.a(minor_gc.o):/build/ocaml/byterun/caml/major_gc.h:67: multiple definition of
-  #     `caml_major_ring'; libcamlrun.a(stacks.o):/build/ocaml/byterun/caml/major_gc.h:67: first defined here
-  # Match -fcommon workaround in ocaml-4.06 itself.
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  buildPhase = ''
-    make -j9 world.opt
-  '';
-
-  meta = with lib; {
-    branch = "4.06";
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix
index e5f10739d6a91..3f005243d6074 100644
--- a/pkgs/development/compilers/firrtl/default.nix
+++ b/pkgs/development/compilers/firrtl/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.chisel-lang.org/firrtl/";
     license = licenses.asl20;
-    maintainers =  with maintainers; [ ];
+    maintainers =  [ ];
   };
 }
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
index 65ed655e57974..d67e9f47ac48f 100644
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix
@@ -282,6 +282,12 @@ stdenv.mkDerivation rec {
       isScript "$i" || continue
       sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
     done
+  '' + lib.optionalString stdenv.targetPlatform.isDarwin ''
+    # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
+    # detects `llvm-ar` even though the resulting archives are not supported by ld64.
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
+    # https://github.com/haskell/cabal/issues/8882
+    sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
   '';
 
   # Apparently necessary for the ghc Alpine (musl) bindist:
@@ -403,8 +409,5 @@ stdenv.mkDerivation rec {
     # `pkgsMusl`.
     platforms = builtins.attrNames ghcBinDists.${distSetName};
     maintainers = lib.teams.haskell.members;
-    # packages involving hsc2hs (clock) produce libraries our
-    # ld can't link against
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix
index 5b01856786fed..f086f22cc1af7 100644
--- a/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/pkgs/development/compilers/gnu-cobol/default.nix
@@ -4,6 +4,7 @@
 , autoconf269
 , automake
 , libtool
+, pkg-config
 # libs
 , cjson
 , db
@@ -20,14 +21,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gnu-cobol";
-  version = "3.1.2";
+  version = "3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz";
-    sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r";
+    hash = "sha256-O7SK9GztR3n6z0H9wu5g5My4bqqZ0BCzZoUxXfOcLuI=";
   };
 
   nativeBuildInputs = [
+    pkg-config
     autoconf269
     automake
     libtool
@@ -51,14 +53,27 @@ stdenv.mkDerivation rec {
   # Skips a broken test
   postPatch = ''
     sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at
+    # upstream reports the following tests as known failures
+    # test 843:
+    sed -i '14180i\AT_SKIP_IF([true])' tests/testsuite.src/run_misc.at
+    # test 875:
+    sed -i '2894s/^/AT_SKIP_IF([true])/' tests/testsuite.src/run_file.at
   '';
 
   preConfigure = ''
     autoconf
     aclocal
     automake
+  '' + lib.optionalString stdenv.isDarwin ''
+    # when building with nix on darwin, configure will use GNU strip,
+    # which fails due to using --strip-unneeded, which is not supported
+    substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip'
   '';
 
+  # error: call to undeclared function 'xmlCleanupParser'
+  # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+  env.CFLAGS = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration";
+
   enableParallelBuilding = true;
 
   installFlags = [ "install-pdf" "install-html" "localedir=$out/share/locale" ];
@@ -71,7 +86,7 @@ stdenv.mkDerivation rec {
     runHook preInstallCheck
 
     # Run tests
-    make -j$NIX_BUILD_CORES check
+    TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make check
 
     # Sanity check
     message="Hello, COBOL!"
@@ -96,7 +111,7 @@ stdenv.mkDerivation rec {
     description = "Open-source COBOL compiler";
     homepage = "https://sourceforge.net/projects/gnucobol/";
     license = with licenses; [ gpl3Only lgpl3Only ];
-    maintainers = with maintainers; [ ericsagnes lovesegfault ];
+    maintainers = with maintainers; [ ericsagnes lovesegfault techknowlogick ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/development/compilers/juniper/default.nix
index edf3e4b6374c4..09a7f9b286b25 100644
--- a/pkgs/development/compilers/juniper/default.nix
+++ b/pkgs/development/compilers/juniper/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.juniper-lang.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 43f940a846616..4e2754def4ded 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -2,6 +2,7 @@
 , preLibcCrossHeaders
 , substitute, substituteAll, fetchFromGitHub, fetchpatch, fetchurl
 , overrideCC, wrapCCWith, wrapBintoolsWith
+, libxcrypt
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 , targetLlvm
@@ -49,6 +50,10 @@ let
       ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc"
       echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
     '';
+    mkExtraBuildCommandsBasicRt = cc: mkExtraBuildCommands0 cc + ''
+      ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
+      ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share"
+    '';
     mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + ''
       ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
       ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
@@ -245,34 +250,50 @@ let
       '' + mkExtraBuildCommands cc;
     };
 
-    clangNoLibcxx = wrapCCWith rec {
+    clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = targetLlvmLibraries.libcxx;
+      bintools = bintools';
+      extraPackages = [
+        targetLlvmLibraries.compiler-rt-no-libc
+      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [
+        targetLlvmLibraries.libunwind
+      ];
+      extraBuildCommands = ''
+        echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+        echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommandsBasicRt cc;
+    };
+
+    clangWithLibcAndBasicRt = wrapCCWith rec {
       cc = tools.clang-unwrapped;
       libcxx = null;
       bintools = bintools';
       extraPackages = [
-        targetLlvmLibraries.compiler-rt
+        targetLlvmLibraries.compiler-rt-no-libc
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
-        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
         echo "-nostdlib++" >> $out/nix-support/cc-cflags
-      '' + mkExtraBuildCommands cc;
+      '' + mkExtraBuildCommandsBasicRt cc;
     };
 
-    clangNoLibc = wrapCCWith rec {
+    clangNoLibcWithBasicRt = wrapCCWith rec {
       cc = tools.clang-unwrapped;
       libcxx = null;
       bintools = bintoolsNoLibc';
       extraPackages = [
-        targetLlvmLibraries.compiler-rt
+        targetLlvmLibraries.compiler-rt-no-libc
       ];
       extraBuildCommands = ''
         echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
-        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-      '' + mkExtraBuildCommands cc;
+        echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommandsBasicRt cc;
     };
 
-    clangNoCompilerRt = wrapCCWith rec {
+    clangNoLibcNoRt = wrapCCWith rec {
       cc = tools.clang-unwrapped;
       libcxx = null;
       bintools = bintoolsNoLibc';
@@ -282,6 +303,8 @@ let
       '' + mkExtraBuildCommands0 cc;
     };
 
+    # This is an "oddly ordered" bootstrap just for Darwin. Probably
+    # don't want it otherwise.
     clangNoCompilerRtWithLibc = wrapCCWith rec {
       cc = tools.clang-unwrapped;
       libcxx = null;
@@ -290,13 +313,23 @@ let
       extraBuildCommands = mkExtraBuildCommands0 cc;
     };
 
+    # Aliases
+    clangNoCompilerRt = tools.clangNoLibcNoRt;
+    clangNoLibc = tools.clangNoLibcWithBasicRt;
+    clangNoLibcxx = tools.clangWithLibcAndBasicRt;
   });
 
   libraries = lib.makeExtensible (libraries: let
     callPackage = newScope (libraries // buildLlvmTools // args // metadata);
   in {
 
-    compiler-rt-libc = callPackage ../common/compiler-rt {
+    compiler-rt-libc = callPackage ../common/compiler-rt (let
+      stdenv =
+        if args.stdenv.hostPlatform.useLLVM or false then
+          overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
+        else
+          args.stdenv;
+    in {
       src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l";
       patches = [
         ../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
@@ -312,10 +345,12 @@ let
         ../common/compiler-rt/armv6-sync-ops-no-thumb.patch
         ../common/compiler-rt/armv6-no-ldrexd-strexd.patch
       ];
-      stdenv = if stdenv.hostPlatform.useLLVM or false
-               then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc
-               else stdenv;
-    };
+      inherit stdenv;
+    } // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+      libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {
+        configureFlags = old.configureFlags ++ [ "--disable-symvers" ];
+      });
+    });
 
     compiler-rt-no-libc = callPackage ../common/compiler-rt {
       src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l";
@@ -333,15 +368,22 @@ let
         ../common/compiler-rt/armv6-sync-ops-no-thumb.patch
         ../common/compiler-rt/armv6-no-ldrexd-strexd.patch
       ];
-      stdenv = if stdenv.hostPlatform.useLLVM or false
-               then overrideCC stdenv buildLlvmTools.clangNoCompilerRt
-               else stdenv;
+      stdenv =
+        if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then
+          stdenv
+        else
+          # TODO: make this branch unconditional next rebuild
+          overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
     };
 
-    # N.B. condition is safe because without useLLVM both are the same.
-    compiler-rt = if stdenv.hostPlatform.isAndroid
-      then libraries.compiler-rt-libc
-      else libraries.compiler-rt-no-libc;
+    compiler-rt =
+      # Building the with-libc compiler-rt and WASM doesn't yet work,
+      # because wasilibc doesn't provide some expected things. See
+      # compiler-rt's file for further details.
+      if stdenv.hostPlatform.libc == null || stdenv.hostPlatform.isWasm then
+        libraries.compiler-rt-no-libc
+      else
+        libraries.compiler-rt-libc;
 
     stdenv = overrideCC stdenv buildLlvmTools.clang;
 
@@ -376,7 +418,7 @@ let
           ];
         })
       ];
-      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
+      stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
     };
 
     libunwind = callPackage ../common/libunwind {
@@ -384,7 +426,7 @@ let
       patches = [
         ./libunwind/gnu-install-dirs.patch
       ];
-      stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
+      stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
     };
 
     openmp = callPackage ../common/openmp {
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 67f9661cf7438..71a38d6b49056 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -12,6 +12,7 @@
 , python3
 , xcbuild
 , libllvm
+, libcxx
 , linuxHeaders
 , libxcrypt
 
@@ -33,6 +34,9 @@ let
   useLLVM = stdenv.hostPlatform.useLLVM or false;
   bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
   haveLibc = stdenv.cc.libc != null;
+  # TODO: Make this account for GCC having libstdcxx, which will help
+  # use clean up the `cmakeFlags` rats nest below.
+  haveLibcxx = stdenv.cc.libcxx != null;
   isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16";
   inherit (stdenv.hostPlatform) isMusl isAarch64;
 
@@ -46,8 +50,11 @@ let
       cp -r ${monorepoSrc}/${baseName} "$out"
     '' else src;
 
-  preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
-    cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
+  preConfigure = lib.optionalString (!haveLibc) ''
+    cmakeFlagsArray+=(
+      -DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding"
+      -DCMAKE_ASM_FLAGS="--target=arm-linux-gnueabihf -march=armv6"
+    )
   '';
 in
 
@@ -82,23 +89,32 @@ stdenv.mkDerivation ({
     "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
   ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
     "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
-  ] ++ lib.optionals ((useLLVM || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13")) [
+  ] ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [
+    "-DSANITIZER_CXX_ABI=libcxxabi"
+    "-DSANITIZER_CXX_ABI_LIBNAME=libcxxabi"
+    "-DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON"
+  ] ++ lib.optionals ((!haveLibc || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13")) [
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
-  ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isDarwinStatic) [
+  ] ++ lib.optionals (useLLVM && haveLibc) [
+    "-DCOMPILER_RT_BUILD_SANITIZERS=ON"
+  ] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [
     "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+  ] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [
     "-DCOMPILER_RT_BUILD_XRAY=OFF"
     "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
     "-DCOMPILER_RT_BUILD_MEMPROF=OFF"
     "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary
-  ] ++ lib.optionals (useLLVM || bareMetal) [
+  ] ++ lib.optionals (useLLVM && haveLibc) [
+    "-DCOMPILER_RT_BUILD_PROFILE=ON"
+  ] ++ lib.optionals (!haveLibc || bareMetal) [
      "-DCOMPILER_RT_BUILD_PROFILE=OFF"
-  ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal || isDarwinStatic) [
+  ] ++ lib.optionals (!haveLibc || bareMetal || isDarwinStatic) [
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
-  ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [
+  ] ++ lib.optionals (!haveLibc || bareMetal) [
     "-DCMAKE_C_COMPILER_WORKS=ON"
     "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
     "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
-  ] ++ lib.optionals (useLLVM && !haveLibc) [
+  ] ++ lib.optionals (!haveLibc) [
     "-DCMAKE_C_FLAGS=-nodefaultlibs"
   ] ++ lib.optionals (useLLVM) [
     "-DCOMPILER_RT_BUILD_BUILTINS=ON"
@@ -133,7 +149,7 @@ stdenv.mkDerivation ({
   '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/config-ix.cmake \
       --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-  '' + lib.optionalString (useLLVM && !haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") ''
+  '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") ''
     substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \
       --replace "<stdlib.h>" "<stddef.h>"
   '') + ''
@@ -185,8 +201,12 @@ stdenv.mkDerivation ({
     # "All of the code in the compiler-rt project is dual licensed under the MIT
     # license and the UIUC License (a BSD-like license)":
     license = with lib.licenses; [ mit ncsa ];
-    # compiler-rt requires a Clang stdenv on 32-bit RISC-V:
-    # https://reviews.llvm.org/D43106#1019077
-    broken = stdenv.hostPlatform.isRiscV32 && !stdenv.cc.isClang;
+    broken =
+      # compiler-rt requires a Clang stdenv on 32-bit RISC-V:
+      # https://reviews.llvm.org/D43106#1019077
+      (stdenv.hostPlatform.isRiscV32 && !stdenv.cc.isClang)
+      # emutls wants `<pthread.h>` which isn't avaiable (without exeprimental WASM threads proposal).
+      # `enable_execute_stack.c` Also doesn't sound like something WASM would support.
+      || (stdenv.hostPlatform.isWasm && haveLibc);
   };
 } // (if lib.versionOlder release_version "16" then { inherit preConfigure; } else {}))
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 335129ec9d313..0c7602e4f2fa3 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -5,6 +5,7 @@
   lib,
   stdenv,
   preLibcCrossHeaders,
+  libxcrypt,
   substitute,
   substituteAll,
   fetchFromGitHub,
@@ -114,6 +115,13 @@ let
         ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc"
         echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
       '';
+      mkExtraBuildCommandsBasicRt =
+        cc:
+        mkExtraBuildCommands0 cc
+        + ''
+          ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share"
+        '';
       mkExtraBuildCommands =
         cc:
         mkExtraBuildCommands0 cc
@@ -469,25 +477,76 @@ let
         }
       );
 
-      clangNoLibcxx = wrapCCWith (
+      clangWithLibcAndBasicRtAndLibcxx = wrapCCWith (
+        rec {
+          cc = tools.clang-unwrapped;
+          libcxx = targetLlvmLibraries.libcxx;
+          bintools = bintools';
+          extraPackages =
+            [ targetLlvmLibraries.compiler-rt-no-libc ]
+            ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
+              targetLlvmLibraries.libunwind
+            ];
+          extraBuildCommands =
+            lib.optionalString (lib.versions.major metadata.release_version == "13") (
+              ''
+                echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+                echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
+              ''
+              + lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+                echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
+                echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags
+              ''
+              + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''
+                echo "-lunwind" >> $out/nix-support/cc-ldflags
+              ''
+              + lib.optionalString stdenv.targetPlatform.isWasm ''
+                echo "-fno-exceptions" >> $out/nix-support/cc-cflags
+              ''
+            )
+            + mkExtraBuildCommandsBasicRt cc;
+        }
+        // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
+          nixSupport.cc-cflags =
+            [
+              "-rtlib=compiler-rt"
+              "-Wno-unused-command-line-argument"
+              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+            ]
+            ++ lib.optional (
+              !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
+            ) "--unwindlib=libunwind"
+            ++ lib.optional (
+              !stdenv.targetPlatform.isWasm
+              && !stdenv.targetPlatform.isFreeBSD
+              && stdenv.targetPlatform.useLLVM or false
+            ) "-lunwind"
+            ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
+          nixSupport.cc-ldflags = lib.optionals (
+            !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
+          ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        }
+      );
+
+      clangWithLibcAndBasicRt = wrapCCWith (
         rec {
           cc = tools.clang-unwrapped;
           libcxx = null;
           bintools = bintools';
-          extraPackages = [ targetLlvmLibraries.compiler-rt ];
+          extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
           extraBuildCommands =
             lib.optionalString (lib.versions.major metadata.release_version == "13") ''
               echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
-              echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+              echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
               echo "-nostdlib++" >> $out/nix-support/cc-cflags
             ''
-            + mkExtraBuildCommands cc;
+            + mkExtraBuildCommandsBasicRt cc;
         }
         // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
           nixSupport.cc-cflags =
             [
               "-rtlib=compiler-rt"
-              "-B${targetLlvmLibraries.compiler-rt}/lib"
+              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
               "-nostdlib++"
             ]
             ++ lib.optional (
@@ -496,24 +555,24 @@ let
         }
       );
 
-      clangNoLibc = wrapCCWith (
+      clangNoLibcWithBasicRt = wrapCCWith (
         rec {
           cc = tools.clang-unwrapped;
           libcxx = null;
           bintools = bintoolsNoLibc';
-          extraPackages = [ targetLlvmLibraries.compiler-rt ];
+          extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
           extraBuildCommands =
             lib.optionalString (lib.versions.major metadata.release_version == "13") ''
               echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
-              echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+              echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags
             ''
-            + mkExtraBuildCommands cc;
+            + mkExtraBuildCommandsBasicRt cc;
         }
         // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
           nixSupport.cc-cflags =
             [
               "-rtlib=compiler-rt"
-              "-B${targetLlvmLibraries.compiler-rt}/lib"
+              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
             ]
             ++ lib.optional (
               lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
@@ -521,7 +580,7 @@ let
         }
       );
 
-      clangNoCompilerRt = wrapCCWith (
+      clangNoLibcNoRt = wrapCCWith (
         rec {
           cc = tools.clang-unwrapped;
           libcxx = null;
@@ -542,6 +601,8 @@ let
         }
       );
 
+      # This is an "oddly ordered" bootstrap just for Darwin. Probably
+      # don't want it otherwise.
       clangNoCompilerRtWithLibc =
         wrapCCWith rec {
           cc = tools.clang-unwrapped;
@@ -553,6 +614,11 @@ let
         // lib.optionalAttrs (
           lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
         ) { nixSupport.cc-cflags = [ "-fno-exceptions" ]; };
+
+      # Aliases
+      clangNoCompilerRt = tools.clangNoLibcNoRt;
+      clangNoLibc = tools.clangNoLibcWithBasicRt;
+      clangNoLibcxx = tools.clangWithLibcAndBasicRt;
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "15") {
       # TODO: pre-15: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins'
@@ -627,40 +693,57 @@ let
         );
     in
     {
-      compiler-rt-libc = callPackage ./compiler-rt {
-        patches = compiler-rtPatches;
-        stdenv =
-          if
-            stdenv.hostPlatform.useLLVM or false
-            || (
+      compiler-rt-libc = callPackage ./compiler-rt (
+        let
+          # temp rename to avoid infinite recursion
+          stdenv =
+            if args.stdenv.hostPlatform.useLLVM or false then
+              overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
+            else if
               lib.versionAtLeast metadata.release_version "16"
-              && stdenv.hostPlatform.isDarwin
-              && stdenv.hostPlatform.isStatic
-            )
-          then
-            overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc
-          else
-            args.stdenv;
-      };
+              && args.stdenv.hostPlatform.isDarwin
+              && args.stdenv.hostPlatform.isStatic
+            then
+              overrideCC args.stdenv buildLlvmTools.clangNoCompilerRtWithLibc
+            else
+              args.stdenv;
+        in
+        {
+          patches = compiler-rtPatches;
+          inherit stdenv;
+        }
+        // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+          libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {
+            configureFlags = old.configureFlags ++ [ "--disable-symvers" ];
+          });
+        }
+      );
 
       compiler-rt-no-libc = callPackage ./compiler-rt {
         patches = compiler-rtPatches;
         stdenv =
-          if stdenv.hostPlatform.useLLVM or false then
-            overrideCC stdenv buildLlvmTools.clangNoCompilerRt
+          if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then
+            stdenv
           else
-            stdenv;
+            # TODO: make this branch unconditional next rebuild
+            overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
       };
 
-      # N.B. condition is safe because without useLLVM both are the same.
       compiler-rt =
         if
-          stdenv.hostPlatform.isAndroid
-          || (lib.versionAtLeast metadata.release_version "16" && stdenv.hostPlatform.isDarwin)
+          stdenv.hostPlatform.libc == null
+          # Building the with-libc compiler-rt and WASM doesn't yet work,
+          # because wasilibc doesn't provide some expected things. See
+          # compiler-rt's file for further details.
+          || stdenv.hostPlatform.isWasm
+          # Failing `#include <term.h>` in
+          # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
+          # sanitizers, not sure where to get it.
+          || stdenv.hostPlatform.isFreeBSD
         then
-          libraries.compiler-rt-libc
+          libraries.compiler-rt-no-libc
         else
-          libraries.compiler-rt-no-libc;
+          libraries.compiler-rt-libc;
 
       stdenv = overrideCC stdenv buildLlvmTools.clang;
 
@@ -724,7 +807,7 @@ let
                 )
                 # https://github.com/llvm/llvm-project/issues/64226
                 (metadata.getVersionFile "libcxx/0001-darwin-10.12-mbstate_t-fix.patch");
-          stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
+          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
         }
         // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {
           # TODO: remove this, causes LLVM 13 packages rebuild.
@@ -736,7 +819,7 @@ let
         patches = lib.optional (lib.versionOlder metadata.release_version "17") (
           metadata.getVersionFile "libunwind/gnu-install-dirs.patch"
         );
-        stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx;
+        stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
       };
 
       openmp = callPackage ./openmp {
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 9f960cdf95495..18b99d5ba69a9 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -60,6 +60,6 @@ in stdenv.mkDerivation rec {
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
     license = with licenses; [ bsd3 bsd2 ];
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 425281ef38762..f0664df84dfe8 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     description = "Package manager for PureScript based on package sets";
     mainProgram = "psc-package";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-darwin" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 954c58718cf3e..d66d2c753221e 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     description = "Facebook's friendly syntax to OCaml";
     license = licenses.mit;
     inherit (ocaml.meta) platforms;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix
index 31f6b0709da34..670986b3ffc5c 100644
--- a/pkgs/development/compilers/serpent/default.nix
+++ b/pkgs/development/compilers/serpent/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     '';
     homepage = "https://github.com/ethereum/wiki/wiki/Serpent";
     license = with licenses; [ wtfpl ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix
index 5309093f17800..2a84bfdc8c9ac 100644
--- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix
+++ b/pkgs/development/embedded/fpga/openfpgaloader/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "openFPGALoader";
     homepage = "https://github.com/trabucayre/openFPGALoader";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix
index b5a9937ad2af4..0e962d2f2a2b7 100644
--- a/pkgs/development/embedded/fpga/tinyprog/default.nix
+++ b/pkgs/development/embedded/fpga/tinyprog/default.nix
@@ -34,7 +34,7 @@ with python3Packages; buildPythonApplication rec {
     homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer";
     description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader";
     mainProgram = "tinyprog";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix
index 7eb0f1abc4cff..f7797a7c8ad2b 100644
--- a/pkgs/development/interpreters/guile/3.0.nix
+++ b/pkgs/development/interpreters/guile/3.0.nix
@@ -163,7 +163,7 @@ builder rec {
       foreign function call interface, and powerful string processing.
     '';
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e2dfabfa97816..738e3a8e97174 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix
index 49901e40f17d8..91f7654fcad29 100644
--- a/pkgs/development/interpreters/racket/racket_7_9.nix
+++ b/pkgs/development/interpreters/racket/racket_7_9.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index b69658ff03c74..7eb0de6f689f0 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -71,7 +71,7 @@ mkDerivation rec {
     description = "Programming language for real time audio synthesis";
     homepage = "https://supercollider.github.io";
     changelog = "https://github.com/supercollider/supercollider/blob/Version-${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
index 492033c52c70d..8a2d9a371d3f5 100644
--- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
+++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Community plugins for SuperCollider";
     homepage = "https://supercollider.github.io/sc3-plugins/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index 421958100cb06..f0a45495d70dc 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     broken = (stdenv.isLinux && stdenv.isAarch64);
     description = "Very high level, goal-directed, object-oriented, general purpose applications language";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     license = licenses.gpl2;
     homepage = "http://unicon.org";
diff --git a/pkgs/development/libraries/aemu/LFS64.patch b/pkgs/development/libraries/aemu/LFS64.patch
new file mode 100644
index 0000000000000..e1d06d8073ef7
--- /dev/null
+++ b/pkgs/development/libraries/aemu/LFS64.patch
@@ -0,0 +1,98 @@
+From 455341880f52b4df3b30490db1c17eb65110c00c Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Wed, 29 May 2024 10:29:02 +0200
+Subject: [PATCH] Stop using transitional LFS64 APIs
+
+The *64 APIs were intended for transitional use, and have been removed
+in musl 1.2.4.  Nowadays, the best practice is to set
+_FILE_OFFSET_BITS=64 across the board, making all the unsuffixed APIs
+will be 64-bit.  This fixes building with recent versions of musl, and
+avoids the need to remember to use the *64 variants every time to
+properly handle large files on 32-bit platforms.
+
+Test: build with musl 1.2.4.
+Change-Id: I7fa7a3ae4aa19a765740f5b2af916fd6f0ed0b32
+---
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4de86a4..10c402a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,7 @@
+     add_subdirectory(build-config/${AEMU_COMMON_BUILD_CONFIG})
+ endif()
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extern-c-compat -Wno-return-type-c-linkage")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extern-c-compat -Wno-return-type-c-linkage -D_FILE_OFFSET_BITS=64")
+ 
+ add_subdirectory(base)
+ add_subdirectory(snapshot)
+diff --git a/snapshot/TextureLoader.cpp b/snapshot/TextureLoader.cpp
+index 31e02e8..5c21134 100644
+--- a/snapshot/TextureLoader.cpp
++++ b/snapshot/TextureLoader.cpp
+@@ -46,7 +46,7 @@
+ void TextureLoader::loadTexture(uint32_t texId, const loader_t& loader) {
+     android::base::AutoLock scopedLock(mLock);
+     assert(mIndex.count(texId));
+-    HANDLE_EINTR(fseeko64(mStream.get(), mIndex[texId], SEEK_SET));
++    HANDLE_EINTR(fseeko(mStream.get(), mIndex[texId], SEEK_SET));
+     switch (mVersion) {
+         case 1:
+             loader(&mStream);
+@@ -71,7 +71,7 @@
+         mDiskSize = size;
+     }
+     auto indexPos = mStream.getBe64();
+-    HANDLE_EINTR(fseeko64(mStream.get(), static_cast<int64_t>(indexPos), SEEK_SET));
++    HANDLE_EINTR(fseeko(mStream.get(), static_cast<int64_t>(indexPos), SEEK_SET));
+     mVersion = mStream.getBe32();
+     if (mVersion < 1 || mVersion > 2) {
+         return false;
+diff --git a/snapshot/TextureSaver.cpp b/snapshot/TextureSaver.cpp
+index 537626b..c8854e9 100644
+--- a/snapshot/TextureSaver.cpp
++++ b/snapshot/TextureSaver.cpp
+@@ -50,7 +50,7 @@
+                         [texId](FileIndex::Texture& tex) {
+                             return tex.texId == texId;
+                         }));
+-    mIndex.textures.push_back({texId, ftello64(mStream.get())});
++    mIndex.textures.push_back({texId, ftello(mStream.get())});
+ 
+     CompressingStream stream(mStream);
+     saver(&stream, &mBuffer);
+@@ -60,7 +60,7 @@
+     if (mFinished) {
+         return;
+     }
+-    mIndex.startPosInFile = ftello64(mStream.get());
++    mIndex.startPosInFile = ftello(mStream.get());
+     writeIndex();
+     mEndTime = base::getHighResTimeUs();
+ #if SNAPSHOT_PROFILE > 1
+@@ -74,7 +74,7 @@
+ 
+ void TextureSaver::writeIndex() {
+ #if SNAPSHOT_PROFILE > 1
+-    auto start = ftello64(mStream.get());
++    auto start = ftello(mStream.get());
+ #endif
+ 
+     mStream.putBe32(static_cast<uint32_t>(mIndex.version));
+@@ -83,13 +83,13 @@
+         mStream.putBe32(b.texId);
+         mStream.putBe64(static_cast<uint64_t>(b.filePos));
+     }
+-    auto end = ftello64(mStream.get());
++    auto end = ftello(mStream.get());
+     mDiskSize = uint64_t(end);
+ #if SNAPSHOT_PROFILE > 1
+     printf("texture: index size: %d\n", int(end - start));
+ #endif
+ 
+-    fseeko64(mStream.get(), 0, SEEK_SET);
++    fseeko(mStream.get(), 0, SEEK_SET);
+     mStream.putBe64(static_cast<uint64_t>(mIndex.startPosInFile));
+ }
+ 
diff --git a/pkgs/development/libraries/aemu/default.nix b/pkgs/development/libraries/aemu/default.nix
index e2ea8e5b1cd55..0a2f6fa8b8b20 100644
--- a/pkgs/development/libraries/aemu/default.nix
+++ b/pkgs/development/libraries/aemu/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation {
     hash = "sha256-H3IU9aTFSzUAqYgrtHd4F18hbhZsbOJGC4K5JwMQOOw=";
   };
 
+  patches = [
+    # stop using transitional LFS64 APIs, which are removed in musl 1.2.4
+    # https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/3105640/1
+    ./LFS64.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Cocoa
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index 3b5224c97f936..5125d4c76ebac 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/hoene/libmysofa";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix
index d67e18476a91b..d2c9d28f208cc 100644
--- a/pkgs/development/libraries/audio/mbelib/default.nix
+++ b/pkgs/development/libraries/audio/mbelib/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/szechyjs/mbelib";
     license = licenses.isc;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix
index 15556a4108c67..1cea8079024ca 100644
--- a/pkgs/development/libraries/backward-cpp/default.nix
+++ b/pkgs/development/libraries/backward-cpp/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/bombela/backward-cpp";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 669e2c7d18598..4e96d6a6b9931 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     '';
     license     = licenses.mit;
     platforms   = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 4d21cd10f8ef1..e741893168a93 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
     license = lib.licenses.lgpl2Plus;
 
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 31743a8f68955..7800e82ff27ac 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "Clutter-GTK";
     homepage = "http://www.clutter-project.org/";
     license = lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 804aa13ed91a9..d6720eb181f4c 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2Plus;
     homepage = "http://www.clutter-project.org/";
 
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix
index b26e630f1eae3..c4c015d924813 100644
--- a/pkgs/development/libraries/crossguid/default.nix
+++ b/pkgs/development/libraries/crossguid/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "Lightweight cross platform C++ GUID/UUID library";
     license = licenses.mit;
     homepage = "https://github.com/graeme-hill/crossguid";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix
index f3c78567efc16..44f71982062cd 100644
--- a/pkgs/development/libraries/ctypes_sh/default.nix
+++ b/pkgs/development/libraries/ctypes_sh/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     mainProgram = "ctypes.sh";
     homepage = "https://github.com/taviso/ctypes.sh";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix
index f50b53d47e05c..207904b96cdc9 100644
--- a/pkgs/development/libraries/dbxml/default.nix
+++ b/pkgs/development/libraries/dbxml/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.oracle.com/database/berkeley-db/xml.html";
     description = "Embeddable XML database based on Berkeley DB";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix
index 4fa74b57404c2..f0c60e9506d5c 100644
--- a/pkgs/development/libraries/discord-rpc/default.nix
+++ b/pkgs/development/libraries/discord-rpc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Official library to interface with the Discord client";
     homepage = "https://github.com/discordapp/discord-rpc";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index cb57f5a2f07e0..f9583a097a6ab 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     homepage = "http://enet.bespin.org/";
     description = "Simple and robust network communication layer on top of UDP";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix
index 9100ccad3b31e..adc9649b4d90a 100644
--- a/pkgs/development/libraries/ethash/default.nix
+++ b/pkgs/development/libraries/ethash/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
     homepage = "https://github.com/ethereum/ethash";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix
index eec0756abf4ee..aaab456ab6a58 100644
--- a/pkgs/development/libraries/fbjni/default.nix
+++ b/pkgs/development/libraries/fbjni/default.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     description = "Library designed to simplify the usage of the Java Native Interface";
     homepage = "https://github.com/facebookincubator/fbjni";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 54ffad6fc3955..6d5db4cdac5b5 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "FFmpeg based source library for easy frame accurate access";
     mainProgram = "ffmsindex";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index a412f70704703..8b76c151b4728 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Lightweight audio filtering library made from webrtc code";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix
index bf59bdd1f625a..0a74d6122ee2e 100644
--- a/pkgs/development/libraries/gd/default.nix
+++ b/pkgs/development/libraries/gd/default.nix
@@ -62,6 +62,6 @@ stdenv.mkDerivation rec {
     description = "Dynamic image creation library";
     license = licenses.free; # some custom license
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index 67677e8a85110..cc5ef6f643695 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     homepage = "https://giflib.sourceforge.net/";
     platforms = lib.platforms.unix ++ lib.platforms.windows;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     branch = "5.2";
   };
 }
diff --git a/pkgs/development/libraries/git2-cpp/default.nix b/pkgs/development/libraries/git2-cpp/default.nix
index bf12d2c489489..45750d0b24d47 100644
--- a/pkgs/development/libraries/git2-cpp/default.nix
+++ b/pkgs/development/libraries/git2-cpp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ken-matsui/git2-cpp";
     description = "libgit2 bindings for C++";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix
index 541fb7c14ebb4..c12ab1f22a8f6 100644
--- a/pkgs/development/libraries/gl3w/default.nix
+++ b/pkgs/development/libraries/gl3w/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Simple OpenGL core profile loading";
     homepage = "https://github.com/skaslev/gl3w";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 4ecae5fe48e07..ed5e4ec9b06fc 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec{
     mainProgram = "gloox-config";
     homepage = "http://camaya.net/gloox";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index 6f48f6ed3af44..e004437a77644 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jstedfast/gmime/";
     description = "C/C++ library for creating, editing and parsing MIME messages and structures";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 1fea5408ef2a4..0d1997cf1afc9 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jstedfast/gmime/";
     description = "C/C++ library for creating, editing and parsing MIME messages and structures";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 31b6f7c7d2286..7eb508f27ae9e 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/gnu-efi/";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 46c7b188c9079..2066b1b72ec56 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Canvas widget for GTK based on the the Cairo 2D library";
     homepage = "https://gitlab.gnome.org/Archive/goocanvas";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix
index ccee4831dc7f4..ca6951c30e4d7 100644
--- a/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/pkgs/development/libraries/goocanvasmm/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "C++ bindings for GooCanvas";
     homepage = "https://gitlab.gnome.org/Archive/goocanvasmm";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
index 863ac7ba4bb24..6c1ee550f797d 100644
--- a/pkgs/development/libraries/gsignond/default.nix
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec {
     mainProgram = "gsignond";
     homepage = "https://gitlab.com/accounts-sso/gsignond";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 };
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 6141528a9fe6b..7f58b4d11ce32 100644
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
index 977bc1489420c..d9012a3aa7981 100644
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
index bc496e8ac2ccd..06999b225de14 100644
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
index bd87d4f72bb5d..3154f92b596f6 100644
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
     homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 0845b871777be..ffa4ca77e251e 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Generic Security Service";
     mainProgram = "gss";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix
index 41e3e1cba97d6..1232224faa131 100644
--- a/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/pkgs/development/libraries/gstreamer/devtools/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index cf15a4c406263..89830f3aed312 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
index da74ec243cefa..68485f7e7454a 100644
--- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
+++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
     description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms";
     homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index e3065437f5d84..92156dec54ea8 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 3ecfd37758ce8..9e8d95b77a908 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -263,6 +263,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs";
     license = with licenses; [ mpl20 asl20 mit lgpl21Plus ];
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 62f11a580c21d..a341f4df4efd0 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -86,6 +86,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gstreamer.freedesktop.org";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix
index f8e50f384590e..3657f62f929c4 100644
--- a/pkgs/development/libraries/gthree/default.nix
+++ b/pkgs/development/libraries/gthree/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     description = "GObject/GTK port of three.js";
     homepage = "https://github.com/alexlarsson/gthree";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin
   };
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 3c7a6a3b3b23b..7e75108b1a3ec 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "Word-processor-style highlighting GtkTextView widget";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 2f48bd668de47..4e704a4859132 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -55,6 +55,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.all;
     license = with licenses; [ gpl2 lgpl21 mpl11 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 0c48ad94ec7e5..edd9c8a79e9cd 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -96,6 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.imlib2;
     pkgConfigModules = [ "imlib2" ];
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index 0e74478982f3f..bc1c3736f730b 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.ip2location.com/developers/c";
     license = with licenses; [ gpl3Plus lgpl3Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix
index ff490414da858..9c6cc585f9b32 100644
--- a/pkgs/development/libraries/ipu6-camera-hal/default.nix
+++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
     description = "HAL for processing of images in userspace";
     homepage = "https://github.com/intel/ipu6-camera-hal";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix
index 39e10e2dbebd4..362a084d03240 100644
--- a/pkgs/development/libraries/jose/default.nix
+++ b/pkgs/development/libraries/jose/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "C-language implementation of Javascript Object Signing and Encryption";
     mainProgram = "jose";
     homepage = "https://github.com/latchset/jose";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/development/libraries/kcp/default.nix
index 2468ba22d3051..b473419bfdf2d 100644
--- a/pkgs/development/libraries/kcp/default.nix
+++ b/pkgs/development/libraries/kcp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Fast and Reliable ARQ Protocol";
     homepage = "https://github.com/skywind3000/kcp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 78fd58f15141d..0347339205c65 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
     homepage = "https://github.com/tomba/kmsxx";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index fe3a88dc711c2..1439c1046fe2b 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = "http://l-smash.github.io/l-smash/";
     description = "MP4 container utilities";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix
index a467eb8e0d51c..b11da8cb59d38 100644
--- a/pkgs/development/libraries/ldacbt/default.nix
+++ b/pkgs/development/libraries/ldacbt/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license     = licenses.asl20;
     # libldac code detects & #error's out on non-LE byte order
     platforms   = platforms.littleEndian;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix
index 4ca2eb75b44f3..c6723b5879971 100644
--- a/pkgs/development/libraries/libabigail/default.nix
+++ b/pkgs/development/libraries/libabigail/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     description = "ABI Generic Analysis and Instrumentation Library";
     homepage = "https://sourceware.org/libabigail/";
     license = licenses.asl20-llvm;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/development/libraries/libajantv2/default.nix
index 278752b18738d..ed5a57ed7364e 100644
--- a/pkgs/development/libraries/libajantv2/default.nix
+++ b/pkgs/development/libraries/libajantv2/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
     homepage = "https://github.com/aja-video/ntv2";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 63cb0401aae40..b920fe9c3b4e7 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://xiph.org/ao/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix
index 0ad0a264f0074..227afc0eb1f83 100644
--- a/pkgs/development/libraries/libargs/default.nix
+++ b/pkgs/development/libraries/libargs/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "Simple header-only C++ argument parser library";
     homepage = "https://github.com/Taywee/args";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
index b4b558945f0d4..5f987943d8df7 100644
--- a/pkgs/development/libraries/libcacard/default.nix
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Smart card emulation library";
     homepage = "https://gitlab.freedesktop.org/spice/libcacard";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index 4cd36f44013ff..673885b096e45 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "CBOR protocol implementation for C and others";
     homepage = "https://github.com/PJK/libcbor";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index ce113106ce566..aa9f50917be1f 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://www.nongnu.org/libchop/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
index db04b5f59b5cd..f514d3c00a688 100644
--- a/pkgs/development/libraries/libcutl/default.nix
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "https://codesynthesis.com/projects/libcutl/";
     changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}";
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix
index 765efe573a64b..be3717d2cba75 100644
--- a/pkgs/development/libraries/libdatrie/default.nix
+++ b/pkgs/development/libraries/libdatrie/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "This is an implementation of double-array structure for representing trie";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     pkgConfigModules = [ "datrie-0.2" ];
   };
 }
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index f1352cd47b927..bbd9e3898d912 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     description = "Database drivers for libdbi";
     platforms = platforms.all;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 63ca4877da65f..409df07cb2880 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.lgpl2;
     pkgConfigModules = [ "IL" ];
     platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 3478217d7f6b8..34a45e398bcdb 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "Extensible Binary Meta Language library";
     homepage = "https://dl.matroska.org/downloads/libebml/";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix
index 7d5a928aa2f48..8ff7d8c952373 100644
--- a/pkgs/development/libraries/libelfin/default.nix
+++ b/pkgs/development/libraries/libelfin/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/aclements/libelfin/";
     license = licenses.mit;
     description = "C++11 ELF/DWARF parser";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix
index b2ce5b0b2cfc1..24fc1e6dc74ec 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/pkgs/development/libraries/libexecinfo/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";
     license = licenses.bsd2;
     homepage = "https://www.freshports.org/devel/libexecinfo";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 988f706f09c89..ffe9f42326f8f 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -88,6 +88,6 @@ stdenv.mkDerivation rec {
     description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 011e86f067482..b3db03d0240b7 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Fork of libcurl used by GNUnet";
     homepage    = "https://gnunet.org/en/gnurl.html";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.curl;
   };
diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index e2b4ce381b7fb..d25335c891572 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     mainProgram = "handy-0.0-demo";
     homepage = "https://source.puri.sm/Librem5/libhandy";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libhsts/default.nix b/pkgs/development/libraries/libhsts/default.nix
index 967ffe5631726..124b1fc5496c8 100644
--- a/pkgs/development/libraries/libhsts/default.nix
+++ b/pkgs/development/libraries/libhsts/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     mainProgram = "hsts";
     homepage = "https://gitlab.com/rockdaboot/libhsts";
     license = with licenses; [ mit bsd3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix
index 2ac160a9b7b70..3d73ace3c925a 100644
--- a/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/pkgs/development/libraries/libinotify-kqueue/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Inotify shim for macOS and BSD";
     homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd;
   };
 }
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index 33fb21237e411..79a419451de22 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     mainProgram = "jcat-tool";
     homepage = "https://github.com/hughsie/libjcat";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index d33de73e40914..fdebb9d9dc274 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "CMS and X.509 access library";
     mainProgram = "ksba-config";
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.lgpl3;
   };
 }
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 3ccfffa1afbc6..07f24f4d5a06a 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
     homepage = "https://github.com/EasyRPG/liblcf";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index 8bbd6d9d9df03..7eb02d3ddd576 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Library to parse Matroska files";
     homepage = "https://matroska.org/";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix
index 7011f30bcf9d5..0769cf4b1c2ba 100644
--- a/pkgs/development/libraries/libmodulemd/default.nix
+++ b/pkgs/development/libraries/libmodulemd/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     mainProgram = "modulemd-validator";
     homepage = "https://github.com/fedora-modularity/libmodulemd";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index 289d5beac8d74..baada92d43405 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     homepage = "http://libmpeg2.sourceforge.net/";
     description = "Free library for decoding mpeg-2 and mpeg-1 video streams";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
index c178e152d2304..de825b3b9dded 100644
--- a/pkgs/development/libraries/libmx/default.nix
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
         feature is the possibility setting style properties from a CSS format
         file.'';
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix
index ff72711c8a75f..4b241ee2786e8 100644
--- a/pkgs/development/libraries/libqofono/default.nix
+++ b/pkgs/development/libraries/libqofono/default.nix
@@ -52,7 +52,7 @@ mkDerivation rec {
     description = "Library for accessing the ofono daemon, and declarative plugin for it";
     homepage = "https://git.sailfishos.org/mer-core/libqofono/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
index bdb6df0e52f89..95541c97eb89f 100644
--- a/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "Library for managing single signon credentials which can be used from GLib applications";
     homepage = "https://gitlab.com/accounts-sso/libsignon-glib";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 852f19da7877e..dc773c3de4009 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "SIXEL library for console graphics, and converter programs";
     homepage = "https://github.com/libsixel/libsixel";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix
index e5a17b68e0831..abda8137f5c8f 100644
--- a/pkgs/development/libraries/libstatgrab/default.nix
+++ b/pkgs/development/libraries/libstatgrab/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://www.i-scream.org/libstatgrab/";
     description = "Library that provides cross platforms access to statistics about the running system";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 45b7e4caaf1dd..d529c22c9f670 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.theora.org/";
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix ++ platforms.windows;
   };
 }
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix
index 1457030f874cb..2a32900040d8b 100644
--- a/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/pkgs/development/libraries/libtomcrypt/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.libtom.net/LibTomCrypt/";
     changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes";
     license = with licenses; [ publicDomain wtfpl ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix
index c8e00cf4a9419..bcf9270a7158e 100644
--- a/pkgs/development/libraries/libtsm/default.nix
+++ b/pkgs/development/libraries/libtsm/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Terminal-emulator State Machine";
     homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index 642c39e5974a1..1b54ea948dd0c 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     mainProgram = "uchardet";
     homepage = "https://www.freedesktop.org/wiki/Software/uchardet/";
     license = licenses.mpl11;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 066f23cf542aa..5905798ee8808 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation {
     homepage = "https://launchpad.net/libunity";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/development/libraries/libusbgx/default.nix
index 1f6e8f1697729..84dcdff974c03 100644
--- a/pkgs/development/libraries/libusbgx/default.nix
+++ b/pkgs/development/libraries/libusbgx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
       lgpl21Plus # library
       gpl2Plus # examples
     ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 82a37d0434d0a..a4254921e179d 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage    = "https://libuv.org/";
     changelog   = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog";
     pkgConfigModules = [ "libuv" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.all;
     license     = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
   };
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 265e19a1ae77b..9aded47d234af 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; [ gpl3 lgpl3 ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 0263b25f3ba4d..3a6c0ca18edd4 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage    = "https://www.libxl.com/";
     license     = licenses.unfree;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [  ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index 4cc4e2b15c43b..a90ae30fec1ee 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     mainProgram = "xb-tool";
     homepage = "https://github.com/hughsie/libxmlb";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 9ec4090f60f0b..5d55e242f0064 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     description = "C++ wrapper for the libxml2 XML parser library";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix
index 9113b5b6a1a7e..0f99c86f93921 100644
--- a/pkgs/development/libraries/libykclient/default.nix
+++ b/pkgs/development/libraries/libykclient/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
     mainProgram = "ykclient";
     homepage = "https://developers.yubico.com/yubico-c-client";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 0832ef5c6caf2..c52b7085796cc 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/arangodb/linenoise-ng";
     description = "Small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     license = lib.licenses.bsd3;
   };
diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/development/libraries/luabridge/default.nix
index b2f4db56f66ee..16f8841f89c3f 100644
--- a/pkgs/development/libraries/luabridge/default.nix
+++ b/pkgs/development/libraries/luabridge/default.nix
@@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec {
     changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md";
     platforms = platforms.unix;
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix
index 8bb245342ca54..ca58c20eab9b6 100644
--- a/pkgs/development/libraries/mac/default.nix
+++ b/pkgs/development/libraries/mac/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php";
     license = licenses.unfreeRedistributable;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index dddd224ca6faa..ed7406cc52b72 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     description = "Simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP";
     homepage    = "http://libmailcore.com";
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/development/libraries/mitama-cpp-result/default.nix
index 7700483529a9b..69d910e3bd991 100644
--- a/pkgs/development/libraries/mitama-cpp-result/default.nix
+++ b/pkgs/development/libraries/mitama-cpp-result/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
       (like Result and Option in Programming Language Rust).
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index 485c803d4cbea..04f429aa899fd 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     description = "C APIs to exchange datas with the NFC daemon 'Neard'";
     license = licenses.lgpl2;
     homepage = "https://01.org/linux-nfc";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix
index 44315ed898ee0..22478d72200b7 100644
--- a/pkgs/development/libraries/opencl-clang/default.nix
+++ b/pkgs/development/libraries/opencl-clang/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/intel/opencl-clang/";
     description = "Clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules";
     license = licenses.ncsa;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     # error: invalid value 'CL3.0' in '-cl-std=CL3.0'
     broken = stdenv.isDarwin;
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 91201cb576250..d59e6a6342d72 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = "https://opencv.org/";
     license = if enableUnfree then licenses.unfree else licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index f45eacfd157f8..4cde03bdf55be 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller";
     homepage = "http://www.openzwave.net/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 52a4ba32315ee..5b86dc223087c 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     pkgConfigModules = [
       "libpcre"
       "libpcreposix"
diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix
index cf2448bddfcbc..7bcacad37dc92 100644
--- a/pkgs/development/libraries/pipewire/0.2.nix
+++ b/pkgs/development/libraries/pipewire/0.2.nix
@@ -49,6 +49,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://pipewire.org/";
     license = licenses.lgpl21;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix
index 3a9780a960eb2..27f4446891bd0 100644
--- a/pkgs/development/libraries/platform-folders/default.nix
+++ b/pkgs/development/libraries/platform-folders/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "C++ library to look for standard platform directories so that you do not need to write platform-specific code";
     homepage = "https://github.com/sago007/PlatformFolders";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix
index 2fa5a4d268cc1..cfc75ce0c51aa 100644
--- a/pkgs/development/libraries/proj-datumgrid/default.nix
+++ b/pkgs/development/libraries/proj-datumgrid/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Repository for proj datum grids";
     homepage = "https://proj4.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "nad2bin";
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index e29cbe6d73d36..71f8e90b774a2 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
     homepage = "https://protobuf.dev/";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "protoc";
   };
 })
diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix
index d8c2b3dec1a4d..946cb50359359 100644
--- a/pkgs/development/libraries/psqlodbc/default.nix
+++ b/pkgs/development/libraries/psqlodbc/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "ODBC driver for PostgreSQL";
     license = licenses.lgpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 4c75b475c17cb..aa0926a849cc9 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     description = "QPlatformTheme for a better Qt application inclusion in GNOME";
     homepage = "https://github.com/FedoraQt/QGnomePlatform";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix
index ba6c5066d0683..237751c6f8f2d 100644
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/pkgs/development/libraries/qrencode/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: rec {
       such as a mobile phone with CCD.
     '';
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "qrencode";
   };
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index 9b9c2bd39d648..3ef599887eb4d 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}";
     license = licenses.boost;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index ad8252f48e8cb..ce369eb6ff3fd 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "C++ framework for property based testing inspired by QuickCheck";
     inherit (finalAttrs.src.meta) homepage;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd2;
     pkgConfigModules = [
       "rapidcheck"
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix
index 1b20f76eaa294..c433f32728e1c 100644
--- a/pkgs/development/libraries/rapidxml/default.nix
+++ b/pkgs/development/libraries/rapidxml/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = "https://rapidxml.sourceforge.net/";
     license = licenses.boost;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix
index e67719d1428b7..0ba51a86893ac 100644
--- a/pkgs/development/libraries/rapidyaml/default.nix
+++ b/pkgs/development/libraries/rapidyaml/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Library to parse and emit YAML, and do it fast";
     homepage = "https://github.com/biojppm/rapidyaml";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 47823f45ef632..944896d1cf57e 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple and easy-to-use library to enjoy videogames programming";
     homepage = "https://www.raylib.com/";
     license = licenses.zlib;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
   };
diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix
index c7f5303c5b0b5..45b9f299aa2d5 100644
--- a/pkgs/development/libraries/rinutils/default.nix
+++ b/pkgs/development/libraries/rinutils/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/shlomif/rinutils";
     changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/rtlcss/default.nix b/pkgs/development/libraries/rtlcss/default.nix
index 327e7b2626dae..4143e649ea5c7 100644
--- a/pkgs/development/libraries/rtlcss/default.nix
+++ b/pkgs/development/libraries/rtlcss/default.nix
@@ -20,6 +20,6 @@ buildNpmPackage rec {
     mainProgram = "rtlcss";
     homepage = "https://rtlcss.com";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix
index d2f6b1ee8aec4..a1a1ed8a69bc0 100644
--- a/pkgs/development/libraries/science/math/itpp/default.nix
+++ b/pkgs/development/libraries/science/math/itpp/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     homepage = "https://itpp.sourceforge.net/";
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin
   };
 }
diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix
index f8f1af00fe66b..89372fca3f639 100644
--- a/pkgs/development/libraries/sope/default.nix
+++ b/pkgs/development/libraries/sope/default.nix
@@ -59,6 +59,6 @@ gnustep.stdenv.mkDerivation rec {
     license = licenses.publicDomain;
     homepage = "https://github.com/inverse-inc/sope";
     platforms = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index af7848cdf85f2..c5dc183dd1432 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     mainProgram = "sqlcipher";
     homepage = "https://www.zetetic.net/sqlcipher/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/development/libraries/sregex/default.nix
index f69e09c8873b5..58ef91c31908b 100644
--- a/pkgs/development/libraries/sregex/default.nix
+++ b/pkgs/development/libraries/sregex/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams";
     mainProgram = "sregex-cli";
     license = licenses.bsd3;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix
index f96bb0724bf28..5e3cc62ea41b8 100644
--- a/pkgs/development/libraries/stb/default.nix
+++ b/pkgs/development/libraries/stb/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/nothings/stb";
     license = licenses.publicDomain;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index a11544dd78930..5d58212d70c62 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     homepage = "https://github.com/stxxl/stxxl";
     license = licenses.boost;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "stxxl_tool";
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 2e2f411502962..4978f8b96f58a 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -69,6 +69,6 @@ tcl.mkTclDerivation {
     homepage = "https://www.tcl.tk/";
     license = licenses.tcltk;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix
index 68550b5ab4743..078ae201ea2a2 100644
--- a/pkgs/development/libraries/tl-expected/default.nix
+++ b/pkgs/development/libraries/tl-expected/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html";
     license = licenses.cc0;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 09e6e2d6a03ca..4ee7a90dd3108 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "C++ library to facilitate using C++ design patterns";
     homepage = "https://www.gnu.org/software/commoncpp/";
     license = lib.licenses.lgpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index d22ff81c2530a..710979057d439 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "Project for mocking web service APIs which use HTTP or HTTPS";
     homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix
index 88fa1d763f01f..09ec29e7043b7 100644
--- a/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/pkgs/development/libraries/vapoursynth/editor.nix
@@ -37,7 +37,7 @@ let
       description = "Cross-platform editor for VapourSynth scripts";
       homepage = "https://github.com/YomikoR/VapourSynth-Editor";
       license = licenses.mit;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       platforms = platforms.all;
     };
   };
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index ea40b8a27da63..b005582b7f541 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     mainProgram = "volume_key";
     homepage = "https://pagure.io/volume_key/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/development/libraries/wfa2-lib/default.nix
index 49db133382b01..519343ff5a207 100644
--- a/pkgs/development/libraries/wfa2-lib/default.nix
+++ b/pkgs/development/libraries/wfa2-lib/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Wavefront alignment algorithm library v2";
     homepage = "https://github.com/smarco/WFA2-lib";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 687a51832f96a..81b7b9140ae76 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -23,6 +23,7 @@
 , glslang
 , libliftoff
 , libdisplay-info
+, lcms2
 , nixosTests
 
 , enableXWayland ? true
@@ -137,5 +138,19 @@ rec {
     ];
   };
 
-  wlroots = wlroots_0_17;
+  wlroots_0_18 = generic {
+    version = "0.18.0";
+    hash = "sha256-LiRnvu7qCbfSg+ONWVCtWwdzxxFZHfbgmy7zApCIW40=";
+    extraNativeBuildInputs = [
+      hwdata
+    ];
+    extraBuildInputs = [
+      ffmpeg
+      libliftoff
+      libdisplay-info
+      lcms2
+    ];
+  };
+
+  wlroots = wlroots_0_18;
 }
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 3a414166c77a7..e986ab87fface 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = "https://utelle.github.io/wxsqlite3/";
     description = "C++ wrapper around the public domain SQLite 3.x for wxWidgets";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = with licenses; [ lgpl3Plus gpl3Plus ];
   };
 }
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index e46599634d174..2be8ea48b8e2e 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.videolan.org/developers/x264.html";
     license = licenses.gpl2Plus;
     platforms = platforms.unix ++ platforms.windows;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 7f44834d48672..9d485f7d6d2ed 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,4 +1,5 @@
 { lib
+, gccStdenv
 , stdenv
 , fetchurl
 , fetchpatch
@@ -66,7 +67,11 @@ stdenv.mkDerivation rec {
     })
     # Fix detection of NEON (and armv6 build) :
     ./fix-neon-detection.patch
-  ];
+  ]
+    # CMake files require a bit of patching to support CMAKE_ASM_COMPILER.
+    # Made by @RossComputerGuy for x265 v3.5.
+    # https://mailman.videolan.org/pipermail/x265-devel/2024-July/013734.html
+    ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-clang-asm.patch;
 
   postPatch = ''
     substituteInPlace cmake/Version.cmake \
@@ -89,7 +94,9 @@ stdenv.mkDerivation rec {
     (mkFlag ppaSupport "ENABLE_PPA")
     (mkFlag vtuneSupport "ENABLE_VTUNE")
     (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
-  ];
+  ]
+    # Clang does not support the endfunc directive so use GCC.
+    ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc";
 
   cmakeStaticLibFlags = [
     "-DHIGH_BIT_DEPTH=ON"
diff --git a/pkgs/development/libraries/x265/fix-clang-asm.patch b/pkgs/development/libraries/x265/fix-clang-asm.patch
new file mode 100644
index 0000000000000..6aa5fe2f0a0e1
--- /dev/null
+++ b/pkgs/development/libraries/x265/fix-clang-asm.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a407271b4..593628e0f 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -310,7 +310,7 @@ if(GCC)
+     endif()
+     check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) 
+     if (CC_HAS_STACK_REALIGN)
+-        add_definitions(-mstackrealign)
++        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-mstackrealign>)
+     endif()
+     # Disable exceptions. Reduce executable size, increase compability.
+     check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG)
+@@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
+             list(APPEND ASM_OBJS ${ASM}.${SUFFIX})
+             add_custom_command(
+                 OUTPUT ${ASM}.${SUFFIX}
+-                COMMAND ${CMAKE_CXX_COMPILER}
++                COMMAND ${CMAKE_ASM_COMPILER}
+                 ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
+                 DEPENDS ${ASM_SRC})
+         endforeach()
+diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
+index 12b643ad5..876f3543d 100644
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -16,6 +16,7 @@ endif(EXTRA_LIB)
+ if(ENABLE_ASSEMBLY)
+     set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1)
+     list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1")
++    enable_language(ASM)
+ endif(ENABLE_ASSEMBLY)
+ 
+ if(ENABLE_ASSEMBLY AND X86)
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index 2cf0cc3ef8df9..c0194ed8435d7 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     downloadPage = "https://www.aleksey.com/xmlsec/download.html";
     license = licenses.mit;
     mainProgram = "xmlsec1";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/libraries/yas/default.nix b/pkgs/development/libraries/yas/default.nix
index b06d995007fa2..0dad3fbf76dd0 100644
--- a/pkgs/development/libraries/yas/default.nix
+++ b/pkgs/development/libraries/yas/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/niXman/yas";
     description = "Yet Another Serialization";
     license = licenses.boost;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index 742f581f7e333..3af451ec84e06 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     mainProgram = "ykpamcfg";
     homepage = "https://developers.yubico.com/yubico-pam";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 6bf15fc6f83a3..e99fd42b854e8 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -848,6 +848,32 @@ buildLuarocksPackage {
   };
 }) {};
 
+llscheck = callPackage({ ansicolors, argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-cjson, luaOlder, luafilesystem, penlight }:
+buildLuarocksPackage {
+  pname = "llscheck";
+  version = "0.5.0-1";
+  knownRockspec = (fetchurl {
+    url    = "mirror://luarocks/llscheck-0.5.0-1.rockspec";
+    sha256 = "1bcyg1gphlgwmra8l1503yaw6wfihs1fksdvvp1y38zryhkvj0dy";
+  }).outPath;
+  src = fetchFromGitHub {
+    owner = "jeffzi";
+    repo = "llscheck";
+    rev = "v0.5.0";
+    hash = "sha256-cG/FNzOwvLvrAEut4OvXI8WWSVzNEl4r3OgiSnp3S5c=";
+  };
+
+  disabled = luaOlder "5.1";
+  propagatedBuildInputs = [ ansicolors argparse lua-cjson luafilesystem penlight ];
+
+  meta = {
+    homepage = "https://github.com/jeffzi/llscheck";
+    description = "Human-friendly Lua code analysis powered by Lua Language Server";
+    maintainers = with lib.maintainers; [ mrcjkb ];
+    license.fullName = "MIT";
+  };
+}) {};
+
 lmathx = callPackage({ buildLuarocksPackage, fetchurl }:
 buildLuarocksPackage {
   pname = "lmathx";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 1c9352ae1b2a7..b5b5cf9acd6d7 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -35,6 +35,7 @@
 , libxcrypt
 , libyaml
 , luajitPackages
+, lua-language-server
 , mariadb
 , magic-enum
 , mpfr
@@ -246,6 +247,10 @@ in
     meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
   });
 
+  llscheck = prev.llscheck.overrideAttrs (oa: {
+    propagatedBuildInputs = oa.propagatedBuildInputs ++ [ lua-language-server ];
+  });
+
   lmathx = prev.luaLib.overrideLuarocks prev.lmathx (drv:
     if luaAtLeast "5.1" && luaOlder "5.2" then {
       version = "20120430.51-1";
diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix
index ff6dc5656bb0b..737457a646508 100644
--- a/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/pkgs/development/mobile/imgpatchtools/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/erfanoabdi/imgpatchtools";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/mobile/titanium-alloy/default.nix b/pkgs/development/mobile/titanium-alloy/default.nix
index bb45289e3f40a..e0e534db5d53b 100644
--- a/pkgs/development/mobile/titanium-alloy/default.nix
+++ b/pkgs/development/mobile/titanium-alloy/default.nix
@@ -24,6 +24,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/tidev/alloy";
     license = lib.licenses.asl20;
     mainProgram = "alloy";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/mobile/titanium/default.nix b/pkgs/development/mobile/titanium/default.nix
index 0318ceeb18eb0..28a92af107d18 100644
--- a/pkgs/development/mobile/titanium/default.nix
+++ b/pkgs/development/mobile/titanium/default.nix
@@ -24,6 +24,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/tidev/titanium-cli";
     license = lib.licenses.asl20;
     mainProgram = "titanium";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index 5ee1d58615b03..81ea134dd29c1 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "CMake modules needed to build Open WebOS components";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index d82e6daeda463..e62808ee9b7e6 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Utility for communicating with WebOS devices";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index 64ec15661c3ed..390b201d93c63 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "Daemon for communicating with WebOS devices";
     mainProgram = "novacomd";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 42ee799db75a3..5bbe69039d842 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -68,6 +68,7 @@ mapAliases {
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
   inherit (pkgs) clubhouse-cli; # added 2023-08-18
+  inherit (pkgs) coc-diagnostic; # added 2024-06-29
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 89836eaf6aca6..4a23f5a836497 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -31,7 +31,6 @@
 , "coc-clangd"
 , "coc-cmake"
 , "coc-css"
-, "coc-diagnostic"
 , "coc-docker"
 , "coc-emmet"
 , "coc-eslint"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 44c05331eada5..1613637d8afb2 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -62822,24 +62822,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-diagnostic = nodeEnv.buildNodePackage {
-    name = "coc-diagnostic";
-    packageName = "coc-diagnostic";
-    version = "0.24.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.24.1.tgz";
-      sha512 = "pAiP55qF3Uh4Mb7QzJAhtMyys3OOVg9iowupr27XBnoFZJxmxOZYG5nydOtHKBqhXIJ+mMfy/okHNLheD/4w/w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "diagnostic-languageserver extension for coc.nvim";
-      homepage = "https://github.com/iamcco/coc-diagnostic#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-docker = nodeEnv.buildNodePackage {
     name = "coc-docker";
     packageName = "coc-docker";
diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index ae70482fd4b2e..f814cba26b1dd 100644
--- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
     description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested";
     homepage = "https://github.com/aantron/bisect_ppx";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "bisect-ppx-report";
   };
 }
diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
index 688d78e4c8d45..e0057f07464e1 100644
--- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
+++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
@@ -29,7 +29,7 @@ buildDunePackage rec {
       * stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function.
     '';
     homepage = "https://github.com/briskml/brisk-reconciler";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/bytestring/default.nix b/pkgs/development/ocaml-modules/bytestring/default.nix
index 3714846ee6b5c..8ed2a3ec47a0c 100644
--- a/pkgs/development/ocaml-modules/bytestring/default.nix
+++ b/pkgs/development/ocaml-modules/bytestring/default.nix
@@ -39,7 +39,7 @@ buildDunePackage rec {
     description = "Efficient, immutable, pattern-matchable, UTF friendly byte strings";
     homepage = "https://github.com/riot-ml/riot";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix
index 7e5f256a1a743..dbe915468d9f9 100644
--- a/pkgs/development/ocaml-modules/bz2/default.nix
+++ b/pkgs/development/ocaml-modules/bz2/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library";
     downloadPage = "https://gitlab.com/irill/camlbz2";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix
index 3b746ccfbdce3..b79a69e432136 100644
--- a/pkgs/development/ocaml-modules/coin/default.nix
+++ b/pkgs/development/ocaml-modules/coin/default.nix
@@ -30,7 +30,7 @@ buildDunePackage rec {
     description = "Library to normalize an KOI8-{U,R} input to Unicode";
     homepage = "https://github.com/mirage/coin";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "coin.generate";
   };
 }
diff --git a/pkgs/development/ocaml-modules/colors/default.nix b/pkgs/development/ocaml-modules/colors/default.nix
index 00ae0ff7cfe15..2b7f5fbee3f47 100644
--- a/pkgs/development/ocaml-modules/colors/default.nix
+++ b/pkgs/development/ocaml-modules/colors/default.nix
@@ -30,6 +30,6 @@ buildDunePackage rec {
     homepage = "https://github.com/leostera/colors";
     changelog = "https://github.com/leostera/colors/blob/${version}/CHANGES.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix
index df0a530e062f1..f13e239a795ca 100644
--- a/pkgs/development/ocaml-modules/csexp/default.nix
+++ b/pkgs/development/ocaml-modules/csexp/default.nix
@@ -20,6 +20,6 @@ buildDunePackage rec {
     homepage = "https://github.com/ocaml-dune/csexp";
     changelog = "https://github.com/ocaml-dune/csexp/raw/${version}/CHANGES.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix
index 1be0a0e49ce22..dae074b05fac5 100644
--- a/pkgs/development/ocaml-modules/cudf/default.nix
+++ b/pkgs/development/ocaml-modules/cudf/default.nix
@@ -27,6 +27,6 @@ buildDunePackage rec {
     homepage = "https://www.mancoosi.org/cudf/";
     downloadPage = "https://gforge.inria.fr/projects/cudf/";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/dune-rpc/default.nix b/pkgs/development/ocaml-modules/dune-rpc/default.nix
index 569be123794c2..3e83d04d5d7e4 100644
--- a/pkgs/development/ocaml-modules/dune-rpc/default.nix
+++ b/pkgs/development/ocaml-modules/dune-rpc/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "Library to connect and control a running dune instance";
     inherit (dune_3.meta) homepage;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix
index f17cdd60d2e14..fc99f4213e150 100644
--- a/pkgs/development/ocaml-modules/dune-site/default.nix
+++ b/pkgs/development/ocaml-modules/dune-site/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "Library for embedding location information inside executable and libraries";
     inherit (dune_3.meta) homepage;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix
index 3a785d5306f0b..a99f10899e583 100644
--- a/pkgs/development/ocaml-modules/fiber/default.nix
+++ b/pkgs/development/ocaml-modules/fiber/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "Structured concurrency library";
     homepage = "https://github.com/ocaml-dune/fiber";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/flex/default.nix b/pkgs/development/ocaml-modules/flex/default.nix
index b8a56d5224fca..99af6da926809 100644
--- a/pkgs/development/ocaml-modules/flex/default.nix
+++ b/pkgs/development/ocaml-modules/flex/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "Native Reason implementation of CSS Flexbox layout. An Yoga project port";
     homepage = "https://github.com/jordwalke/flex";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix
index ff3c31519ed45..b9ab63ac84c5f 100644
--- a/pkgs/development/ocaml-modules/junit/default.nix
+++ b/pkgs/development/ocaml-modules/junit/default.nix
@@ -19,7 +19,7 @@ buildDunePackage (rec {
   meta = with lib; {
     description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://github.com/Khady/ocaml-junit";
   };
 })
diff --git a/pkgs/development/ocaml-modules/lun/default.nix b/pkgs/development/ocaml-modules/lun/default.nix
index c7303d0a00810..17dcaead3c22c 100644
--- a/pkgs/development/ocaml-modules/lun/default.nix
+++ b/pkgs/development/ocaml-modules/lun/default.nix
@@ -15,6 +15,6 @@ buildDunePackage rec {
     description = "Optics in OCaml";
     homepage = "https://git.robur.coop/robur/lun";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix
index dbd55b2c599d2..2c0fa7186e84a 100644
--- a/pkgs/development/ocaml-modules/mccs/default.nix
+++ b/pkgs/development/ocaml-modules/mccs/default.nix
@@ -22,6 +22,6 @@ buildDunePackage rec {
     downloadPage = "https://github.com/AltGr/ocaml-mccs";
     homepage = "https://www.i3s.unice.fr/~cpjm/misc/";
     license = with licenses; [ lgpl21 gpl3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix
index 7dd83aaae3775..0a5970fe73911 100644
--- a/pkgs/development/ocaml-modules/miou/default.nix
+++ b/pkgs/development/ocaml-modules/miou/default.nix
@@ -16,6 +16,6 @@ buildDunePackage rec {
     homepage = "https://git.robur.coop/robur/miou";
     changelog = "https://git.robur.coop/robur/miou/src/tag/v${version}/CHANGES.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix
index 6a74ef4cec82d..b66617f7d2860 100644
--- a/pkgs/development/ocaml-modules/mldoc/default.nix
+++ b/pkgs/development/ocaml-modules/mldoc/default.nix
@@ -64,6 +64,6 @@ buildDunePackage rec {
     homepage = "https://github.com/logseq/mldoc";
     description = "Another Emacs Org-mode and Markdown parser";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index f2b650137e790..6ad8420fc134a 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -77,6 +77,6 @@ buildDunePackage rec {
     description = "Jsonrpc protocol implementation in OCaml";
     license = licenses.isc;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index c075fc59be1ce..92b625a4ab47b 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -19,6 +19,6 @@ buildDunePackage rec {
       homepage = "https://github.com/backtracking/ocamlgraph";
       description = "Graph library for OCaml";
       license = licenses.gpl2Oss;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/opam-core/default.nix b/pkgs/development/ocaml-modules/opam-core/default.nix
index 3106fe83fd70f..8f9c4bf37a31e 100644
--- a/pkgs/development/ocaml-modules/opam-core/default.nix
+++ b/pkgs/development/ocaml-modules/opam-core/default.nix
@@ -1,15 +1,13 @@
-{ lib, buildDunePackage, unzip
-, opam, ocamlgraph, re, cppo }:
+{ lib, buildDunePackage, opam
+, jsonm, ocamlgraph, re, sha, swhid_core, uutf
+}:
 
 buildDunePackage rec {
   pname = "opam-core";
 
   inherit (opam) src version;
 
-  useDune2 = true;
-
-  nativeBuildInputs = [ unzip cppo ];
-  propagatedBuildInputs = [ ocamlgraph re ];
+  propagatedBuildInputs = [ jsonm ocamlgraph uutf re sha swhid_core ];
 
   # get rid of check for curl at configure time
   # opam-core does not call curl at run time
diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix
index 1360c62816360..00d0b146fb71f 100644
--- a/pkgs/development/ocaml-modules/opam-format/default.nix
+++ b/pkgs/development/ocaml-modules/opam-format/default.nix
@@ -1,19 +1,14 @@
-{ lib, buildDunePackage, unzip, opam-core, opam-file-format }:
+{ lib, buildDunePackage, opam-core, opam-file-format }:
 
 buildDunePackage rec {
   pname = "opam-format";
 
-  useDune2 = true;
-
   inherit (opam-core) src version;
 
-  minimalOCamlVersion = "4.02.3";
-
   # get rid of check for curl at configure time
   # opam-format does not call curl at run time
   configureFlags = [ "--disable-checks" ];
 
-  nativeBuildInputs = [ unzip ];
   propagatedBuildInputs = [ opam-core opam-file-format ];
 
   meta = opam-core.meta // {
diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix
index 008cc2812453c..c23db8c79f0e0 100644
--- a/pkgs/development/ocaml-modules/opam-repository/default.nix
+++ b/pkgs/development/ocaml-modules/opam-repository/default.nix
@@ -1,25 +1,20 @@
-{ lib, buildDunePackage, unzip, opam-format, curl }:
+{ lib, buildDunePackage, opam-format, curl }:
 
 buildDunePackage rec {
   pname = "opam-repository";
 
-  minimalOCamlVersion = "4.02";
-
-  useDune2 = true;
-
   inherit (opam-format) src version;
 
   patches = [ ./download-tool.patch ];
   postPatch = ''
     substituteInPlace src/repository/opamRepositoryConfig.ml \
-      --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\""
+      --replace-fail "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\""
   '';
 
-  strictDeps = true;
-
-  nativeBuildInputs = [ unzip curl ];
   propagatedBuildInputs = [ opam-format ];
 
+  configureFlags = [ "--disable-checks" ];
+
   meta = opam-format.meta // {
     description = "OPAM repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends";
     maintainers = with lib.maintainers; [ sternenseemann ];
diff --git a/pkgs/development/ocaml-modules/opam-state/default.nix b/pkgs/development/ocaml-modules/opam-state/default.nix
index d841631dfd07c..a0f2332783d7f 100644
--- a/pkgs/development/ocaml-modules/opam-state/default.nix
+++ b/pkgs/development/ocaml-modules/opam-state/default.nix
@@ -1,18 +1,15 @@
-{ lib, buildDunePackage, unzip, opam, opam-repository }:
+{ lib, buildDunePackage, opam, opam-repository, spdx_licenses }:
 
 buildDunePackage rec {
   pname = "opam-state";
 
   inherit (opam) src version;
 
-  useDune2 = true;
-
   # get rid of check for curl at configure time
   # opam-state does not call curl at run time
   configureFlags = [ "--disable-checks" ];
 
-  nativeBuildInputs = [ unzip ];
-  propagatedBuildInputs = [ opam-repository ];
+  propagatedBuildInputs = [ opam-repository spdx_licenses ];
 
   meta = opam.meta // {
     description = "OPAM development library handling the ~/.opam hierarchy, repository and switch states";
diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix
index 5412f8955d76c..19f446ad85d51 100644
--- a/pkgs/development/ocaml-modules/pp/default.nix
+++ b/pkgs/development/ocaml-modules/pp/default.nix
@@ -21,6 +21,6 @@ buildDunePackage rec {
       "A an alternative pretty printing library to the Format module of the OCaml standard library";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/prettym/default.nix b/pkgs/development/ocaml-modules/prettym/default.nix
index a229eb9f35f16..8d6a855fe74fc 100644
--- a/pkgs/development/ocaml-modules/prettym/default.nix
+++ b/pkgs/development/ocaml-modules/prettym/default.nix
@@ -42,6 +42,6 @@ buildDunePackage rec {
     description = "Simple bounded encoder to serialize human readable values and respect the 80-column constraint";
     license = lib.licenses.mit;
     homepage = "https://github.com/dinosaure/prettym";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix
index edc9e1c6dcbd2..6fd6a7d8b9c24 100644
--- a/pkgs/development/ocaml-modules/ptmap/default.nix
+++ b/pkgs/development/ocaml-modules/ptmap/default.nix
@@ -23,6 +23,6 @@ buildDunePackage rec {
     homepage = "https://www.lri.fr/~filliatr/software.en.html";
     description = "Maps over integers implemented as Patricia trees";
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix
index c6c5abfb7f9a3..ebce5ad277f27 100644
--- a/pkgs/development/ocaml-modules/reason-native/cli.nix
+++ b/pkgs/development/ocaml-modules/reason-native/cli.nix
@@ -19,6 +19,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native";
     homepage = "https://reason-native.com/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix
index 38d95a0c0f396..6bede4e59e50a 100644
--- a/pkgs/development/ocaml-modules/reason-native/console.nix
+++ b/pkgs/development/ocaml-modules/reason-native/console.nix
@@ -19,6 +19,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console";
     homepage = "https://reason-native.com/docs/console/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix
index 6cd04ece01f6b..9b166beb40cb3 100644
--- a/pkgs/development/ocaml-modules/reason-native/dir.nix
+++ b/pkgs/development/ocaml-modules/reason-native/dir.nix
@@ -18,6 +18,6 @@ buildDunePackage {
     description = "Library that provides a consistent API for common system, user and application directories consistently on all platforms";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
index 462b667921c1b..8cfd60d144bf3 100644
--- a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
+++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
@@ -20,6 +20,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer";
     homepage = "https://reason-native.com/docs/file-context-printer/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix
index 35a099771dc64..5cf7c3d417dea 100644
--- a/pkgs/development/ocaml-modules/reason-native/fp.nix
+++ b/pkgs/development/ocaml-modules/reason-native/fp.nix
@@ -14,6 +14,6 @@ buildDunePackage {
     description = "Library for creating and operating on file paths consistently on multiple platforms";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/frame.nix b/pkgs/development/ocaml-modules/reason-native/frame.nix
index dc845db552498..78ccdd2a87932 100644
--- a/pkgs/development/ocaml-modules/reason-native/frame.nix
+++ b/pkgs/development/ocaml-modules/reason-native/frame.nix
@@ -19,6 +19,6 @@ buildDunePackage {
     description = "Reason Native text layout library";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/frame";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/fs.nix b/pkgs/development/ocaml-modules/reason-native/fs.nix
index c553f6a6ad989..fc65551a2481e 100644
--- a/pkgs/development/ocaml-modules/reason-native/fs.nix
+++ b/pkgs/development/ocaml-modules/reason-native/fs.nix
@@ -18,7 +18,7 @@ buildDunePackage {
     description = "Reason Native file system API";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fs";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
index 1a424fad5401a..82a3ff55057f0 100644
--- a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
+++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
@@ -20,6 +20,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console";
     homepage = "https://reason-native.com/docs/pastel/console";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix
index d8a4d7e0f9ca5..473c6a09e5faa 100644
--- a/pkgs/development/ocaml-modules/reason-native/pastel.nix
+++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix
@@ -21,6 +21,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel";
     homepage = "https://reason-native.com/docs/pastel/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
index 4006df5d90c8b..c58782260385d 100644
--- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
+++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
@@ -20,6 +20,6 @@ buildDunePackage {
     description = "Library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix
index 3f320fd2364d6..b24fd7c527f3f 100644
--- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix
+++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix
@@ -22,6 +22,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr";
     homepage = "https://reason-native.com/docs/refmterr/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
index 46097c45ebdf9..92743f4c2ecba 100644
--- a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
+++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
@@ -26,6 +26,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter";
     homepage = "https://reason-native.com/docs/rely/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix
index e3ca4b9ad5e9c..e9870f92b33c0 100644
--- a/pkgs/development/ocaml-modules/reason-native/rely.nix
+++ b/pkgs/development/ocaml-modules/reason-native/rely.nix
@@ -22,6 +22,6 @@ buildDunePackage {
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely";
     homepage = "https://reason-native.com/docs/rely/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix
index 1b80ae2a71fd3..bb2bbef3c4a16 100644
--- a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix
+++ b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix
@@ -14,6 +14,6 @@ buildDunePackage {
     description = "Configuration used to generate the @reason-native/unicode library";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode-config";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/unicode.nix b/pkgs/development/ocaml-modules/reason-native/unicode.nix
index 544367424d0b7..7ce536a6e2138 100644
--- a/pkgs/development/ocaml-modules/reason-native/unicode.nix
+++ b/pkgs/development/ocaml-modules/reason-native/unicode.nix
@@ -14,6 +14,6 @@ buildDunePackage {
     description = "Easy to use and well documented Unicode symbols";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/reason-native/utf8.nix b/pkgs/development/ocaml-modules/reason-native/utf8.nix
index 40c874b5b41f7..0a18e68a15419 100644
--- a/pkgs/development/ocaml-modules/reason-native/utf8.nix
+++ b/pkgs/development/ocaml-modules/reason-native/utf8.nix
@@ -14,7 +14,7 @@ buildDunePackage {
     description = "Utf8 logic with minimal dependencies";
     downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/utf8";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix
index 6a871069eb6af..ce2e9d3aad707 100644
--- a/pkgs/development/ocaml-modules/rebez/default.nix
+++ b/pkgs/development/ocaml-modules/rebez/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
     description = "Cubic bezier implementation in Reason / OCaml";
     homepage = "https://github.com/jchavarri/rebez/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "RebezApp.exe";
   };
 }
diff --git a/pkgs/development/ocaml-modules/reperf/default.nix b/pkgs/development/ocaml-modules/reperf/default.nix
index 10c6ee65626c8..ce3164fa19a23 100644
--- a/pkgs/development/ocaml-modules/reperf/default.nix
+++ b/pkgs/development/ocaml-modules/reperf/default.nix
@@ -35,7 +35,7 @@ buildDunePackage rec {
       Outputs a JSON performance report, and compare it with previous iterations - and fail if a regression is detected.
     '';
     homepage = "https://github.com/bryphe/reperf";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix
index f7ead9e0a194e..7be8d9c21caf1 100644
--- a/pkgs/development/ocaml-modules/riot/default.nix
+++ b/pkgs/development/ocaml-modules/riot/default.nix
@@ -38,6 +38,6 @@ buildDunePackage rec {
     homepage = "https://github.com/leostera/riot";
     changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix
index c6260d713bc16..975595808ad09 100644
--- a/pkgs/development/ocaml-modules/rope/default.nix
+++ b/pkgs/development/ocaml-modules/rope/default.nix
@@ -28,6 +28,6 @@ buildDunePackage {
     homepage = "https://github.com/Chris00/ocaml-rope";
     description = "Ropes (“heavyweight strings”) in OCaml";
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix
index 492e01ce5d59d..8e366bda1d657 100644
--- a/pkgs/development/ocaml-modules/rosetta/default.nix
+++ b/pkgs/development/ocaml-modules/rosetta/default.nix
@@ -29,6 +29,6 @@ buildDunePackage rec {
     description = "Universal decoder of an encoded flow (UTF-7, ISO-8859 and KOI8) to Unicode";
     license = lib.licenses.mit;
     homepage = "https://github.com/mirage/rosetta";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/spdx_licenses/default.nix b/pkgs/development/ocaml-modules/spdx_licenses/default.nix
new file mode 100644
index 0000000000000..807de8387fee5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/spdx_licenses/default.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchurl,
+  buildDunePackage,
+}:
+
+buildDunePackage rec {
+  pname = "spdx_licenses";
+  version = "1.2.0";
+
+  minimalOCamlVersion = "4.08";
+
+  src = fetchurl {
+    url = "https://github.com/kit-ty-kate/spdx_licenses/releases/download/v${version}/spdx_licenses-${version}.tar.gz";
+    hash = "sha256-9ViB7PRDz70w3RJczapgn2tJx9wTWgAbdzos6r3J2r4=";
+  };
+
+  meta = {
+    homepage = "https://github.com/kit-ty-kate/spdx_licenses";
+    description = "A library providing a strict SPDX License Expression parser";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/spices/default.nix b/pkgs/development/ocaml-modules/spices/default.nix
index a1d6b06d156bb..263d1441e35b9 100644
--- a/pkgs/development/ocaml-modules/spices/default.nix
+++ b/pkgs/development/ocaml-modules/spices/default.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
     homepage = "https://github.com/leostera/minttea";
     changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/ocaml-modules/swhid_core/default.nix b/pkgs/development/ocaml-modules/swhid_core/default.nix
new file mode 100644
index 0000000000000..bc9998be2dc2d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/swhid_core/default.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+}:
+
+buildDunePackage rec {
+  pname = "swhid_core";
+  version = "0.1";
+
+  minimalOCamlVersion = "4.03";
+
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "swhid_core";
+    rev = version;
+    hash = "sha256-uLnVbptCvmBeNbOjGjyAWAKgzkKLDTYVFY6SNH2zf0A=";
+  };
+
+  meta = {
+    description = "OCaml library to work with swhids";
+    homepage = "https://github.com/ocamlpro/swhid_core";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix
index ed0dc49fa9e18..31eccdcaa6e54 100644
--- a/pkgs/development/ocaml-modules/telegraml/default.nix
+++ b/pkgs/development/ocaml-modules/telegraml/default.nix
@@ -33,6 +33,6 @@ buildDunePackage rec {
     description = "OCaml library implementing the Telegram bot API";
     homepage = "https://github.com/nv-vn/TelegraML/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix
index 008822459cc15..cc9404ed193e2 100644
--- a/pkgs/development/ocaml-modules/tsdl-image/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix
@@ -34,6 +34,6 @@ buildDunePackage rec {
     description = "OCaml SDL2_image bindings to go with Tsdl";
     homepage = "https://github.com/sanette/tsdl-image";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
index d2721c5398e24..888c88029d261 100644
--- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
@@ -34,6 +34,6 @@ buildDunePackage rec {
     description = "SDL2_mixer bindings to go with Tsdl";
     homepage = "https://github.com/sanette/tsdl-mixer";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
index 086b0789a6a51..33f5f834e01aa 100644
--- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
@@ -34,6 +34,6 @@ buildDunePackage rec {
     description = "SDL2_ttf bindings for Ocaml with Tsdl";
     homepage = "https://github.com/sanette/tsdl-ttf";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/unstrctrd/default.nix b/pkgs/development/ocaml-modules/unstrctrd/default.nix
index b9be734a40e87..e5959f803c8f9 100644
--- a/pkgs/development/ocaml-modules/unstrctrd/default.nix
+++ b/pkgs/development/ocaml-modules/unstrctrd/default.nix
@@ -41,6 +41,6 @@ buildDunePackage rec {
     description = "Library for parsing email headers";
     homepage = "https://github.com/dinosaure/unstrctrd";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix
index 52543175e07cc..b6260451965d7 100644
--- a/pkgs/development/ocaml-modules/xdg/default.nix
+++ b/pkgs/development/ocaml-modules/xdg/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
   meta = with lib; {
     description = "XDG Base Directory Specification";
     inherit (dune_3.meta) homepage;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/ocaml-modules/yuscii/default.nix b/pkgs/development/ocaml-modules/yuscii/default.nix
index 3080cb772e9e3..a8b8d7640f7bd 100644
--- a/pkgs/development/ocaml-modules/yuscii/default.nix
+++ b/pkgs/development/ocaml-modules/yuscii/default.nix
@@ -34,6 +34,6 @@ buildDunePackage rec {
     description = "Simple mapper between UTF-7 to Unicode according RFC2152";
     license = lib.licenses.mit;
     homepage = "https://github.com/mirage/yuscii";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix
index b571de2b9b728..b702ba73c5cd8 100644
--- a/pkgs/development/php-packages/phpinsights/default.nix
+++ b/pkgs/development/php-packages/phpinsights/default.nix
@@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: {
     homepage = "https://phpinsights.com/";
     license = lib.licenses.mit;
     mainProgram = "phpinsights";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index 9447d53ae699c..4b1bfa9109816 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Abseil Python Common Libraries";
     homepage = "https://github.com/abseil/abseil-py";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/accessible-pygments/default.nix b/pkgs/development/python-modules/accessible-pygments/default.nix
index 74bd2d1e09a04..177b3529ecc64 100644
--- a/pkgs/development/python-modules/accessible-pygments/default.nix
+++ b/pkgs/development/python-modules/accessible-pygments/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Quansight-Labs/accessible-pygments";
     changelog = "https://github.com/Quansight-Labs/accessible-pygments/raw/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 9025dd327fb8d..bb6b018fd8490 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Python module to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
     homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index cc50b3b216d6a..7639b8ac9fdc2 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
     homepage = "https://github.com/ethanfurman/aenum";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix
index 1d122ce63f4b5..38e7f713f91cb 100644
--- a/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/pkgs/development/python-modules/agate-dbf/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Adds read support for dbf files to agate";
     homepage = "https://github.com/wireservice/agate-dbf";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix
index 5615b4a9aa6ce..5e346cbb95077 100644
--- a/pkgs/development/python-modules/agate-excel/default.nix
+++ b/pkgs/development/python-modules/agate-excel/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/wireservice/agate-excel";
     changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix
index e5a723d2e2626..5d63ef863e3d5 100644
--- a/pkgs/development/python-modules/agate-sql/default.nix
+++ b/pkgs/development/python-modules/agate-sql/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Adds SQL read/write support to agate";
     homepage = "https://github.com/wireservice/agate-sql";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix
index f5a0e1f19be90..00bbf90ffbe68 100644
--- a/pkgs/development/python-modules/agate/default.nix
+++ b/pkgs/development/python-modules/agate/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/wireservice/agate";
     changelog = "https://github.com/wireservice/agate/blob/${version}/CHANGELOG.rst";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix
index 8184e3e31172c..4beaeb6ce2c33 100644
--- a/pkgs/development/python-modules/aioamqp/default.nix
+++ b/pkgs/development/python-modules/aioamqp/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "AMQP implementation using asyncio";
     homepage = "https://github.com/polyconseil/aioamqp";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix
index 30e08af915303..6bb210a1efa0f 100644
--- a/pkgs/development/python-modules/aioapns/default.nix
+++ b/pkgs/development/python-modules/aioapns/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Fatal1ty/aioapns";
     changelog = "https://github.com/Fatal1ty/aioapns/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix
index c8f6a896c9fe8..54ab5e62bcf32 100644
--- a/pkgs/development/python-modules/aioaseko/default.nix
+++ b/pkgs/development/python-modules/aioaseko/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aioaseko";
-  version = "0.1.1";
+  version = "0.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "milanmeu";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-bjPl0yrRaTIEEuPV8NbWu2hx/es5bcu2tDBZV+95fUc=";
+    hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix
index 89906cb458143..bd448f41c8499 100644
--- a/pkgs/development/python-modules/aioftp/default.nix
+++ b/pkgs/development/python-modules/aioftp/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     description = "Python FTP client/server for asyncio";
     homepage = "https://aioftp.readthedocs.io/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
index e770098d63b3a..e320648df3c71 100644
--- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
+++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bdraco/aiohttp-fast-zlib";
     changelog = "https://github.com/bdraco/aiohttp-fast-zlib/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 490dea94e0379..580db1e840dd7 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Jinja2 support for aiohttp";
     homepage = "https://github.com/aio-libs/aiohttp_jinja2";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
index 8f11cfb849962..f91f30c396107 100644
--- a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
+++ b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jelmer/aiohttp-openmetrics/";
     changelog = "https://github.com/jelmer/aiohttp-openmetrics/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 39468b2116a52..6ba83412a62b6 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -14,26 +14,27 @@
 
 buildPythonPackage rec {
   pname = "aiohue";
-  version = "4.7.1";
+  version = "4.7.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
-    repo = pname;
+    repo = "aiohue";
     rev = "refs/tags/${version}";
-    hash = "sha256-/9kATmBNhKXt2PWB1pRdMJr+QzP23ajQK+jA8BuJ7J4=";
+    hash = "sha256-ZMrB09DXyjPlQ0hOSi+3aI2eSGDAFfhBDPfBsvNpaE4=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'version = "0.0.0"' 'version = "${version}"'
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"' \
+      --replace-fail "--cov" ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     awesomeversion
     aiohttp
     asyncio-throttle
diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix
index 347a4a5f78a3d..d1d208b5f6d57 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/pkgs/development/python-modules/aiokafka/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://aiokafka.readthedocs.org";
     changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix
index 6e074397fac85..69963a4650608 100644
--- a/pkgs/development/python-modules/aiomqtt/default.nix
+++ b/pkgs/development/python-modules/aiomqtt/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sbtinstruments/aiomqtt";
     changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix
index 093b6f0b96d3e..62abc53330da5 100644
--- a/pkgs/development/python-modules/aiomysql/default.nix
+++ b/pkgs/development/python-modules/aiomysql/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "MySQL driver for asyncio";
     homepage = "https://github.com/aio-libs/aiomysql";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index 318411ae9a5dd..26d02803c4d77 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cjrh/aiorun";
     changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix
index 3bad4e1870703..4fdd1c6a67b73 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/pkgs/development/python-modules/aiosqlite/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jreese/aiosqlite";
     changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix
index 41b58f12fbd33..b9c3534c36d62 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/Kane610/aiounifi";
     changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "aiounifi";
   };
 }
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 039f03baacfbb..4d41cc11a6369 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     homepage = "https://bitbucket.org/zzzeek/alembic";
     description = "Database migration tool for SQLAlchemy";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "alembic";
   };
 }
diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 0c6ed904a4541..746877f57e2ef 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -98,6 +98,6 @@ buildPythonPackage rec {
     mainProgram = "ansible-runner";
     homepage = "https://github.com/ansible/ansible-runner";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 8caf7e1e6274c..9a83bfebd7544 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -95,6 +95,6 @@ buildPythonPackage rec {
     description = "Radically simple IT automation";
     homepage = "https://www.ansible.com";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 2dd2567589f24..cf484c1f07b34 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -89,6 +89,6 @@ buildPythonPackage {
     homepage = "https://www.ansible.com";
     changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix
index 95f78fcec2391..83f3b3207e713 100644
--- a/pkgs/development/python-modules/ansicolor/default.nix
+++ b/pkgs/development/python-modules/ansicolor/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Library to produce ansi color output and colored highlighting and diffing";
     homepage = "https://github.com/numerodix/ansicolor/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ansimarkup/default.nix b/pkgs/development/python-modules/ansimarkup/default.nix
index 2f0a1f8501035..8be72615a24a6 100644
--- a/pkgs/development/python-modules/ansimarkup/default.nix
+++ b/pkgs/development/python-modules/ansimarkup/default.nix
@@ -2,23 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   pytestCheckHook,
   colorama,
 }:
 
 buildPythonPackage rec {
   pname = "ansimarkup";
-  version = "1.5.0";
-  format = "setuptools";
+  version = "2.1.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gvalkov";
     repo = "python-ansimarkup";
-    rev = "v${version}";
-    hash = "sha256-HGeVapv2Z5GtPwSp3+dvUwAH0bFqu+Bmk5E6SRr7NO4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+kZt8tv09RHrMRZtvJPBBiFaeCksXyrlHqIabPrXYDY=";
   };
 
-  propagatedBuildInputs = [ colorama ];
+  build-system = [ setuptools ];
+
+  dependencies = [ colorama ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix
index c80d24d1c9b63..f45f8c0ccaf05 100644
--- a/pkgs/development/python-modules/ansiwrap/default.nix
+++ b/pkgs/development/python-modules/ansiwrap/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jonathaneunice/ansiwrap";
     changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index ad79271688f61..ed26deaabdec9 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.28.1";
+  version = "0.31.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n5Vmi2frUdSbrmulopwUlIO+blkf7cANoKTaTFZQdjw=";
+    hash = "sha256-cKXOIVpF+CZ542JX9flQYKSrdYkSVeNESUztB6yaATQ=";
   };
 
   build-system = [
@@ -71,6 +71,7 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # Test require network access
     "tests/api_resources"
+    "tests/lib/test_bedrock.py"
   ];
 
   pytestFlagsArray = [
diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix
index e3cf3a0c7757a..60a34a3e03958 100644
--- a/pkgs/development/python-modules/apipkg/default.nix
+++ b/pkgs/development/python-modules/apipkg/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Namespace control and lazy-import mechanism";
     homepage = "https://github.com/pytest-dev/apipkg";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix
index f64100ce676d9..1b156fe005217 100644
--- a/pkgs/development/python-modules/apispec/default.nix
+++ b/pkgs/development/python-modules/apispec/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "Pluggable API specification generator with support for the OpenAPI Specification";
     homepage = "https://github.com/marshmallow-code/apispec";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix
index b199051111370..a4329ff4dc70b 100644
--- a/pkgs/development/python-modules/applicationinsights/default.nix
+++ b/pkgs/development/python-modules/applicationinsights/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "This project extends the Application Insights API surface to support Python";
     homepage = "https://github.com/Microsoft/ApplicationInsights-Python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 76396668aec96..657537bbc5689 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  apprise,
   babel,
   buildPythonPackage,
   click,
@@ -17,6 +18,7 @@
   requests,
   requests-oauthlib,
   setuptools,
+  testers,
 }:
 
 buildPythonPackage rec {
@@ -60,13 +62,19 @@ buildPythonPackage rec {
     # Nondeterministic. Fails with `assert 0 == 1`
     "test_notify_emoji_general"
     "test_plugin_mqtt_general"
+    # Nondeterministic. Fails with `assert 3 == 2`
+    "test_plugin_matrix_transaction_ids_api_v3"
     # Nondeterministic. Fails with `AssertionError`
     "test_plugin_xbmc_kodi_urls"
+    # Nondeterministic. Fails with `AssertionError`
+    "test_plugin_zulip_urls"
   ];
 
   disabledTestPaths = [
     # AttributeError: module 'apprise.plugins' has no attribute 'NotifyBulkSMS'
     "test/test_plugin_bulksms.py"
+    # Nondeterministic. Multiple tests will fail with `AssertionError`
+    "test/test_plugin_workflows.py"
   ];
 
   postInstall = ''
@@ -75,12 +83,19 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "apprise" ];
 
-  meta = with lib; {
+  passthru = {
+    tests.version = testers.testVersion {
+      package = apprise;
+      version = "v${version}";
+    };
+  };
+
+  meta = {
     description = "Push Notifications that work with just about every platform";
     homepage = "https://github.com/caronc/apprise";
     changelog = "https://github.com/caronc/apprise/releases/tag/v${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ getchoo ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "apprise";
   };
 }
diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index 598ad6487026b..2b3ed4f45c196 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -70,6 +70,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/approvals/ApprovalTests.Python";
     changelog = "https://github.com/approvals/ApprovalTests.Python/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix
index 6d038d28ec3e5..d409a535b4632 100644
--- a/pkgs/development/python-modules/apscheduler/default.nix
+++ b/pkgs/development/python-modules/apscheduler/default.nix
@@ -75,6 +75,6 @@ buildPythonPackage rec {
     description = "Library that lets you schedule your Python code to be executed";
     homepage = "https://github.com/agronholm/apscheduler";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix
index f5d268fcf2bf2..5c8c98177b694 100644
--- a/pkgs/development/python-modules/aresponses/default.nix
+++ b/pkgs/development/python-modules/aresponses/default.nix
@@ -4,38 +4,34 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  pytest,
   pytest-asyncio,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aresponses";
-  version = "2.1.6";
-  format = "setuptools";
+  version = "3.0.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = "CircleUp";
-    repo = pname;
+    owner = "aresponses";
+    repo = "aresponses";
     rev = version;
-    hash = "sha256-Ui9ZpWaVBfCbDlZH3EgHX32FIZtyTHnc/UXqtoEyFcw=";
+    hash = "sha256-RklXlIsbdq46/7D6Hv4mdskunqw1a7SFF09OjhrvMRY=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
 
-  buildInputs = [
-    pytest
-    pytest-asyncio
-  ];
-
-  nativeCheckInputs = [
+  dependencies = [
     aiohttp
     pytest-asyncio
-    pytestCheckHook
   ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   disabledTests = [
     # Disable tests which requires network access
     "test_foo"
@@ -47,8 +43,9 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aresponses" ];
 
   meta = with lib; {
+    changelog = "https://github.com/aresponses/aresponses/blob/${src.rev}/README.md#changelog";
     description = "Asyncio testing server";
-    homepage = "https://github.com/circleup/aresponses";
+    homepage = "https://github.com/aresponses/aresponses";
     license = licenses.mit;
     maintainers = with maintainers; [ makefu ];
   };
diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
index c3abfb0c287d2..0df49f5835884 100644
--- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
+++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Low-level CFFI bindings for Argon2";
     homepage = "https://github.com/hynek/argon2-cffi-bindings";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index f63bd17297e1c..60aa3520e738e 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/asana/python-asana";
     changelog = "https://github.com/Asana/python-asana/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 09e00d7ae8f51..6e936c6635ed6 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     description = "Python tools to handle ASDF files";
     homepage = "https://github.com/asdf-format/asdf";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix
index f99b201842e65..326d51f55a64c 100644
--- a/pkgs/development/python-modules/ase/default.nix
+++ b/pkgs/development/python-modules/ase/default.nix
@@ -71,6 +71,6 @@ buildPythonPackage rec {
     description = "Atomic Simulation Environment";
     homepage = "https://wiki.fysik.dtu.dk/ase/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index f83e311d7c4a0..fecc4b98f490f 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Reference ASGI adapters and channel layers";
     homepage = "https://github.com/django/asgiref";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix
index 4895e713cd60b..cd0b3a0895bbf 100644
--- a/pkgs/development/python-modules/asn1tools/default.nix
+++ b/pkgs/development/python-modules/asn1tools/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/eerimoq/asn1tools";
     changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix
index 37c708bed5c07..3f66a9a2bf5dd 100644
--- a/pkgs/development/python-modules/aspell-python/default.nix
+++ b/pkgs/development/python-modules/aspell-python/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Python wrapper for aspell (C extension and Python version)";
     homepage = "https://github.com/WojciechMula/aspell-python";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix
index 9d7a88369aaf8..e1cdd1febe461 100644
--- a/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/pkgs/development/python-modules/astropy-iers-data/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers";
     homepage = "https://github.com/astropy/astropy-iers-data";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/asyncarve/default.nix b/pkgs/development/python-modules/asyncarve/default.nix
new file mode 100644
index 0000000000000..dc760169c215a
--- /dev/null
+++ b/pkgs/development/python-modules/asyncarve/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  mashumaro,
+  orjson,
+  aiohttp,
+  yarl,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "asyncarve";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-5h56Sr0kPLrNPU70W90WsjmWax/N90dRMJ6lI5Mg86E=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    mashumaro
+    orjson
+    aiohttp
+    yarl
+  ];
+
+  # No tests in repo
+  doCheck = false;
+
+  pythonImportsCheck = [ "asyncarve" ];
+
+  meta = with lib; {
+    description = "Simple Arve library";
+    homepage = "https://github.com/arvetech/asyncarve";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 1b77638073f5c..427178dfa037b 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -89,6 +89,6 @@ buildPythonPackage rec {
     homepage = "https://asyncssh.readthedocs.io/";
     changelog = "https://github.com/ronf/asyncssh/blob/v${version}/docs/changes.rst";
     license = licenses.epl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
index 3e7bb3e990b61..05f8cdff4ccbc 100644
--- a/pkgs/development/python-modules/atom/default.nix
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "atom";
-  version = "0.10.4";
+  version = "0.10.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "nucleic";
     repo = "atom";
     rev = "refs/tags/${version}";
-    hash = "sha256-HoUKU6z+6PPBUsvI4earZG9UXN0PrugAxu/F7WUfUe8=";
+    hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix
index 2c878ac8798a2..997466118258d 100644
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -78,6 +78,6 @@ buildPythonPackage rec {
     description = "Atomistic Manipulation Toolkit";
     homepage = "https://github.com/usnistgov/atomman/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix
index c6d6352559b6e..b20f0065dfe57 100644
--- a/pkgs/development/python-modules/attrdict/default.nix
+++ b/pkgs/development/python-modules/attrdict/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bcj/AttrDict";
     changelog = "https://github.com/bcj/AttrDict/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix
index 6a9884beca5cc..96d6b5d0c96a7 100644
--- a/pkgs/development/python-modules/attrs/default.nix
+++ b/pkgs/development/python-modules/attrs/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-attrs/attrs";
     changelog = "https://github.com/python-attrs/attrs/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix
index a5b03baad8d1c..88d2d9af34340 100644
--- a/pkgs/development/python-modules/aubio/default.nix
+++ b/pkgs/development/python-modules/aubio/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "Library for audio and music analysis";
     homepage = "https://aubio.org";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix
index 4bd7594b5fdc3..a6b485d7b2c9c 100644
--- a/pkgs/development/python-modules/audiotools/default.nix
+++ b/pkgs/development/python-modules/audiotools/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Utilities and Python modules for handling audio";
     homepage = "https://audiotools.sourceforge.net/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/auditok/default.nix b/pkgs/development/python-modules/auditok/default.nix
index cad60d86198f8..d6735c9c79099 100644
--- a/pkgs/development/python-modules/auditok/default.nix
+++ b/pkgs/development/python-modules/auditok/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/amsehili/auditok/";
     changelog = "https://github.com/amsehili/auditok/blob/v${version}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix
index 69d4fdedfd2a7..b292153e7d627 100644
--- a/pkgs/development/python-modules/auth0-python/default.nix
+++ b/pkgs/development/python-modules/auth0-python/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/auth0/auth0-python";
     changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 77df68b23c2ac..ed3a469d312b7 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/ValiMail/authentication-headers";
     changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "dmarc-policy-find";
   };
 }
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 1efc211fcc54f..08187be3a2e80 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -144,6 +144,6 @@ buildPythonPackage rec {
     description = "WebSocket and WAMP in Python for Twisted and asyncio";
     homepage = "https://crossbar.io/autobahn";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix
index fd4a0f22d439c..8df21385cf04b 100644
--- a/pkgs/development/python-modules/autocommand/default.nix
+++ b/pkgs/development/python-modules/autocommand/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Autocommand turns a python function into a CLI program";
     homepage = "https://github.com/Lucretiel/autocommand";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index af707983b5958..05d612256e43d 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -47,7 +47,7 @@ let
       description = "Self-service finite-state machines for the programmer on the go";
       mainProgram = "automat-visualize";
       license = licenses.mit;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index 8471970980fe4..e50028415d8a8 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -98,6 +98,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mikeboers/PyAV/";
     changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index e672317cc75f6..c36c24553eced 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -88,6 +88,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/aws/serverless-application-model";
     changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 418a938dc75ed..6774d1fefcc12 100644
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -72,6 +72,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/aws/aws-xray-sdk-python";
     changelog = "https://github.com/aws/aws-xray-sdk-python/blob/${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix
index 7fb7cda0d3aea..33f24c827fdbe 100644
--- a/pkgs/development/python-modules/azure-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index d5bc90eaf57b1..67178fac58aaa 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -99,6 +99,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix
index 71e97c27e8d58..aea811201587f 100644
--- a/pkgs/development/python-modules/azure-cosmos/default.nix
+++ b/pkgs/development/python-modules/azure-cosmos/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cosmos/azure-cosmos";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-cosmos_${version}/sdk/cosmos/azure-cosmos/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix
index 7e030a049f94a..7b2dd03ad09b3 100644
--- a/pkgs/development/python-modules/azure-data-tables/default.nix
+++ b/pkgs/development/python-modules/azure-data-tables/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-data-tables_${version}/sdk/tables/azure-data-tables/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/pkgs/development/python-modules/azure-functions-devops-build/default.nix
index 1b1683d5bfe14..a07ca228b92ea 100644
--- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix
+++ b/pkgs/development/python-modules/azure-functions-devops-build/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Integrate Azure Functions with Azure DevOps. Specifically made for the Azure CLI";
     homepage = "https://github.com/Azure/azure-functions-devops-build";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
index 83ac87a09e905..f8bf2b1c83f61 100644
--- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix
index 61d295e1b1529..66e16fbee10c0 100644
--- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 2cf1f5a0235c2..54200ab0e0ff0 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys";
     changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_${version}/sdk/keyvault/azure-keyvault-keys";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
index b9766e0a93bae..916897d5bf00d 100644
--- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets";
     changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix
index 895ba9f289fee..8b6a3524a04c1 100644
--- a/pkgs/development/python-modules/azure-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Key Vault Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
index de7c2fa6bb3d4..5262587ba1339 100644
--- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/apimanagement/azure-mgmt-apimanagement";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-apimanagement_${version}/sdk/apimanagement/azure-mgmt-apimanagement/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 4415da9527565..9fc23174d60dc 100644
--- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appconfiguration/azure-mgmt-appconfiguration";
     changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-appconfiguration_${version}/sdk/appconfiguration/azure-mgmt-appconfiguration";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
index f29c1c1ad2c6e..12379092c4a61 100644
--- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/botservice/azure-mgmt-botservice";
     changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-botservice_${version}/sdk/botservice/azure-mgmt-botservice";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index 98f652cf1f806..aa05085d1968a 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix
index 5dc2f51e7f10b..62b1b1cc2863c 100644
--- a/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure Management Core Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
index 2d486d0156ec5..0d3d97aa0b21d 100644
--- a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databox/azure-mgmt-databox";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-databoxedge_${version}/sdk/databox/azure-mgmt-databox/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
index de759e933bf76..288875586b6b0 100644
--- a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/deploymentmanager/azure-mgmt-deploymentmanager";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-deploymentmanager_${version}/sdk/deploymentmanager/azure-mgmt-deploymentmanager/setup.py";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix
index ba9c4cacb49ec..b24b2e0d3c925 100644
--- a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/extendedlocation/azure-mgmt-extendedlocation";
     changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-extendedlocation_${version}/sdk/extendedlocation/azure-mgmt-extendedlocation";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index 4a80dc7e36de7..2007e304f3ab5 100644
--- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-hdinsight_${version}/sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
index d919e7c6163cc..f565ddcd766bf 100644
--- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-imagebuilder";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-imagebuilder_${version}/sdk/compute/azure-mgmt-imagebuilder/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 186258f84ae14..9892b1c34decb 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-kusto_${version}/sdk/kusto/azure-mgmt-kusto/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
index aa2f41d6f7d30..61f8804afa0b1 100644
--- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/managedservices/azure-mgmt-managedservices";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-managedservices_${version}/sdk/managedservices/azure-mgmt-managedservices/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 8490dd2888801..8d12b418a1942 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
index 20bed8458017a..9e3f437ced846 100644
--- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure DNS Private Zones Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
index 02208c8265276..33ac1de82d77e 100644
--- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure Red Hat Openshift Management Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix
index ea1eeecdef0bf..d28b485bfca54 100644
--- a/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/security/azure-mgmt-security";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix
index 8ed3ef2a37fc0..f506c38f2f848 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix
index e38d0f6cc1386..16b8fd1a9f39f 100644
--- a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure Servicelinker Management Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
index 34a562f4e49a0..8a17230abf094 100644
--- a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/sql/azure-mgmt-sqlvirtualmachine";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-sqlvirtualmachine_${version}/sdk/sql/azure-mgmt-sqlvirtualmachine/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
index dbf43887100ba..a5449599400bc 100644
--- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-mgmt-synapse";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-synapse_${version}/sdk/synapse/azure-mgmt-synapse/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 7308578dfdee2..994394d3aec4b 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure Storage Client Library for Python with multi API version support";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
index a3b59c446c036..0e3b8ce8c4f3a 100644
--- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-accesscontrol";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-accesscontrol_${version}/sdk/synapse/azure-synapse-accesscontrol/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index 45150bfc8532c..a952c215ab231 100644
--- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix
index 829577e636da3..dfceb84958399 100644
--- a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-managedprivateendpoints";
     changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-synapse-managedprivateendpoints_${version}/sdk/synapse/azure-synapse-managedprivateendpoints";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix
index fbb9233538098..8c6e244e37bd7 100644
--- a/pkgs/development/python-modules/azure-synapse-spark/default.nix
+++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-spark";
     changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-spark_${version}/sdk/synapse/azure-synapse-spark/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix
index 5c67b77e78f98..3bcca268dab33 100644
--- a/pkgs/development/python-modules/b2sdk/default.nix
+++ b/pkgs/development/python-modules/b2sdk/default.nix
@@ -80,6 +80,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Backblaze/b2-sdk-python";
     changelog = "https://github.com/Backblaze/b2-sdk-python/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix
index 64cd4318226af..9c7a990cbc82c 100644
--- a/pkgs/development/python-modules/babelfish/default.nix
+++ b/pkgs/development/python-modules/babelfish/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Diaoul/babelfish";
     description = "Module to work with countries and languages";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix
index e0b4d3c8ebc17..901f4e1e020d9 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/pkgs/development/python-modules/babelgladeextractor/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gnome-keysign/babel-glade";
     description = "Babel Glade XML files translatable strings extractor";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
index d79b11eeb63be..a9aa34ec01acd 100644
--- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
+++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Backport of Python 3.11's datetime.fromisoformat";
     homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
index 9a0baed50a48a..7e5046f6b618a 100644
--- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
+++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Compatibility shim providing selectable entry points for older implementations";
     homepage = "https://github.com/jaraco/backports.entry_points_selectable";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/backports-tarfile/default.nix b/pkgs/development/python-modules/backports-tarfile/default.nix
index 1b1c7790a91af..49c5c7458c884 100644
--- a/pkgs/development/python-modules/backports-tarfile/default.nix
+++ b/pkgs/development/python-modules/backports-tarfile/default.nix
@@ -59,7 +59,7 @@ let self = buildPythonPackage rec {
     description = "Backport of CPython tarfile module";
     homepage = "https://github.com/jaraco/backports.tarfile";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 };
 in self
diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix
index 5c525685d6227..8dbefd22d281d 100644
--- a/pkgs/development/python-modules/backports-zoneinfo/default.nix
+++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix
@@ -75,6 +75,6 @@ buildPythonPackage rec {
     description = "Backport of the standard library module zoneinfo";
     homepage = "https://github.com/pganssle/zoneinfo";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix
index 17963e1da7634..41563a517e428 100644
--- a/pkgs/development/python-modules/basemap-data/default.nix
+++ b/pkgs/development/python-modules/basemap-data/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
       mit
       lgpl3Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix
index 74759f2a0d980..618e8936f2c02 100644
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
       coastlines, lakes, rivers and political boundaries. See
       http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = with licenses; [
       mit
       lgpl21
diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix
index d1844aaa144da..c9499f7c3473f 100644
--- a/pkgs/development/python-modules/batchspawner/default.nix
+++ b/pkgs/development/python-modules/batchspawner/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jupyterhub/batchspawner";
     changelog = "https://github.com/jupyterhub/batchspawner/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/before-after/default.nix b/pkgs/development/python-modules/before-after/default.nix
index 6756580f5a779..c1dce2b1a4ed0 100644
--- a/pkgs/development/python-modules/before-after/default.nix
+++ b/pkgs/development/python-modules/before-after/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "sugar over the Mock library to help test race conditions";
     homepage = "https://github.com/c-oreills/before_after";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Only;
   };
 }
diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix
index 8a3ebaf0b6655..f954d7c4ab67f 100644
--- a/pkgs/development/python-modules/bids-validator/default.nix
+++ b/pkgs/development/python-modules/bids-validator/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bids-standard/bids-validator";
     changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index 8162c9fe5efef..d3358fe645639 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/celery/billiard";
     changelog = "https://github.com/celery/billiard/blob/v${version}/CHANGES.txt";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/binary/default.nix b/pkgs/development/python-modules/binary/default.nix
index 93cb6d24dae06..ef2135e83f98b 100644
--- a/pkgs/development/python-modules/binary/default.nix
+++ b/pkgs/development/python-modules/binary/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix
index 1102457cb94d4..998974d90ee1c 100644
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@@ -5,11 +5,10 @@
   setuptools,
   looseversion,
   mmtf-python,
-  nose,
   numpy,
   pandas,
   pytestCheckHook,
-  pythonOlder,
+  fetchpatch2,
 }:
 
 buildPythonPackage rec {
@@ -24,6 +23,22 @@ buildPythonPackage rec {
     hash = "sha256-1c78baBBsDyvAWrNx5mZI/Q75wyXv0DAwAdWm3EwX/I=";
   };
 
+  patches = [
+    # Needed for below patch to apply properly
+    (fetchpatch2 {
+      name = "deprecate-mmtf-parsing.patch";
+      url = "https://github.com/BioPandas/biopandas/commit/7a1517dbe76f2c70da8edb35f90c9fa69254e726.patch?full_index=1";
+      hash = "sha256-RFtXFqUYl8GnZ319HsBwx5SUbfUDnR66Ppakdvtg/wI=";
+    })
+    # Remove nose as a dependency.
+    (fetchpatch2 {
+      name = "remove-nose.patch";
+      url = "https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f.patch?full_index=1";
+      hash = "sha256-fVl57/vGuzlYX/MBZnma1ZFCVmIpjr1k8t3bUJnb/uI=";
+      excludes = [ "setup.py" ];
+    })
+  ];
+
   pythonRelaxDeps = [ "looseversion" ];
 
   build-system = [ setuptools ];
@@ -35,10 +50,7 @@ buildPythonPackage rec {
     looseversion
   ];
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
     # require network access
diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix
index 0217979d31da2..69b2b258e1f22 100644
--- a/pkgs/development/python-modules/bitbox02/default.nix
+++ b/pkgs/development/python-modules/bitbox02/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/digitalbitbox/bitbox02-firmware/";
     changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix
index 72cb3205e1553..c32e23e56a921 100644
--- a/pkgs/development/python-modules/blinker/default.nix
+++ b/pkgs/development/python-modules/blinker/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Fast Python in-process signal/event dispatching system";
     homepage = "https://github.com/pallets-eco/blinker/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index 16e9c8f76d474..a9a437af05ff8 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     mainProgram = "btp2";
     homepage = "http://www.boltztrap.org/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix
index 8fd6b60311205..fde29936132f0 100644
--- a/pkgs/development/python-modules/boolean-py/default.nix
+++ b/pkgs/development/python-modules/boolean-py/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Implements boolean algebra in one module";
     homepage = "https://github.com/bastikr/boolean.py";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index 8b84fc8c125f2..18aa852cd73b3 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Fast NumPy array functions";
     homepage = "https://github.com/pydata/bottleneck";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix
index 7e341d4c1ce08..547adcd099a80 100644
--- a/pkgs/development/python-modules/bracex/default.nix
+++ b/pkgs/development/python-modules/bracex/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Bash style brace expansion for Python";
     homepage = "https://github.com/facelessuser/bracex";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix
index 4c16cd2a88937..aca3fcd645d0b 100644
--- a/pkgs/development/python-modules/branca/default.nix
+++ b/pkgs/development/python-modules/branca/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-visualization/branca";
     changelog = "https://github.com/python-visualization/branca/blob/v${version}/CHANGES.txt";
     license = with licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index d9033c4fd3bad..2281fbe3b3143 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     mainProgram = "breathe-apidoc";
     homepage = "https://github.com/michaeljones/breathe";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (sphinx.meta) platforms;
   };
 }
diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix
index 38835ca61f09e..596b173151145 100644
--- a/pkgs/development/python-modules/bring-api/default.nix
+++ b/pkgs/development/python-modules/bring-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bring-api";
-  version = "0.7.3";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "miaucl";
     repo = "bring-api";
     rev = "refs/tags/${version}";
-    hash = "sha256-9asmGm2RwiP2BIygIkLLU30E0zJ/05kvoAfEPlGFW5U=";
+    hash = "sha256-w7DV+Idcg7OobFx+ECimngQKk0SCzd5F+DTg+WcnJwA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix
index 78840a245cea4..f429478eca985 100644
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/google/brotli";
     description = "Generic-purpose lossless compression algorithm";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bthomehub5-devicelist/default.nix b/pkgs/development/python-modules/bthomehub5-devicelist/default.nix
new file mode 100644
index 0000000000000..2c4b9562c16b5
--- /dev/null
+++ b/pkgs/development/python-modules/bthomehub5-devicelist/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  html-table-parser-python3,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "bthomehub5-devicelist";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-bWMwLbFGdMRcZLIVbOptWMOOFzVBm2KxQ9jwqvAU6zA=";
+  };
+
+  pythonRelaxDeps = [ "html-table-parser-python3" ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    html-table-parser-python3
+    requests
+  ];
+
+  # No tests in the package
+  doCheck = false;
+
+  pythonImportsCheck = [ "bthomehub5_devicelist" ];
+
+  meta = {
+    description = "Returns a list of devices currently connected to a BT Home Hub 5";
+    homepage = "https://github.com/ahobsonsayers/bthomehub5-devicelist";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 52aafcf554b67..e6d92d31f3e57 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Scalable persistent components";
     homepage = "http://packages.python.org/BTrees";
     license = licenses.zpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix
index 18466cb31cb39..bfb6f582dd3a9 100644
--- a/pkgs/development/python-modules/bugsnag/default.nix
+++ b/pkgs/development/python-modules/bugsnag/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bugsnag/bugsnag-python";
     changelog = "https://github.com/bugsnag/bugsnag-python/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix
index 54659c6110954..ff64e723cdbc6 100644
--- a/pkgs/development/python-modules/bunch/default.nix
+++ b/pkgs/development/python-modules/bunch/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Python dictionary that provides attribute-style access";
     homepage = "https://github.com/dsc/bunch";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap-keepass/default.nix b/pkgs/development/python-modules/bundlewrap-keepass/default.nix
index a738b0aa9e75f..d69580a00de0f 100644
--- a/pkgs/development/python-modules/bundlewrap-keepass/default.nix
+++ b/pkgs/development/python-modules/bundlewrap-keepass/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.org/project/bundlewrap-keepass";
     description = "Use secrets from keepass in your BundleWrap repo";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap-pass/default.nix b/pkgs/development/python-modules/bundlewrap-pass/default.nix
index c4b58575700da..40014fbe6587e 100644
--- a/pkgs/development/python-modules/bundlewrap-pass/default.nix
+++ b/pkgs/development/python-modules/bundlewrap-pass/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.org/project/bundlewrap-pass";
     description = "Use secrets from pass in your BundleWrap repo";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
index a8dd57f15b788..cf13c27302033 100644
--- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
+++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/trehn/bundlewrap-teamvault";
     description = "Pull secrets from TeamVault into your BundleWrap repo";
     license = [ licenses.gpl3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix
index a16488b81d0db..985a2ada9b5e3 100644
--- a/pkgs/development/python-modules/cached-ipaddress/default.nix
+++ b/pkgs/development/python-modules/cached-ipaddress/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bdraco/cached-ipaddress";
     changelog = "https://github.com/bdraco/cached-ipaddress/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 11a65554116c8..e51fb8e45ab61 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst";
     homepage = "https://github.com/SimonSapin/cairocffi";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     description = "cffi-based cairo bindings for Python";
   };
 }
diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index de527486065dc..a2f64cb79c991 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     license = licenses.lgpl3Plus;
     description = "SVG converter based on Cairo";
     mainProgram = "cairosvg";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 440ac99954f4b..49c9b305626b6 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/casbin/pycasbin";
     changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index e0230c0072e84..aee2824d2926d 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     mainProgram = "cbor2";
     homepage = "https://github.com/agronholm/cbor2";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix
index 988af2d302454..2498e6b5a7511 100644
--- a/pkgs/development/python-modules/cffsubr/default.nix
+++ b/pkgs/development/python-modules/cffsubr/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     mainProgram = "cffsubr";
     homepage = "https://github.com/adobe-type-tools/cffsubr";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 0e182eafcd744..194e3c3ecdb16 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/aws-cloudformation/cfn-lint";
     changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix
index 4a1e79f898945..f4d6bc7a38a95 100644
--- a/pkgs/development/python-modules/cfscrape/default.nix
+++ b/pkgs/development/python-modules/cfscrape/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Python module to bypass Cloudflare's anti-bot page";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 739d828ef2e56..443a7e8c1da60 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Time-handling functionality from netcdf4-python";
     homepage = "https://github.com/Unidata/cftime";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index dec0cbca53cdf..b91eb29a08188 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -105,6 +105,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/aws/chalice";
     changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/changefinder/default.nix b/pkgs/development/python-modules/changefinder/default.nix
index fc34238f00ecc..4405fa8a8525b 100644
--- a/pkgs/development/python-modules/changefinder/default.nix
+++ b/pkgs/development/python-modules/changefinder/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , setuptools
-, nose
+, pytestCheckHook
 , numpy
 , scipy
 , statsmodels
@@ -20,17 +20,21 @@ buildPythonPackage {
     hash = "sha256-1If0gIsMU8673fKSSHVMvDgR1UnYgM/4HiyvZJ9T6VM=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  patches = [ ./fix_test_invocation.patch ];
+
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    nose # not actually required during runtime, but specified as required in `setup.py`
+  pythonRemoveDeps = [ "nose" ];
+
+  dependencies = [
     numpy
     scipy
     statsmodels
   ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "test/test.py" ];
+
   pythonImportsCheck = [ "changefinder" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/changefinder/fix_test_invocation.patch b/pkgs/development/python-modules/changefinder/fix_test_invocation.patch
new file mode 100644
index 0000000000000..f02e2e36d4b54
--- /dev/null
+++ b/pkgs/development/python-modules/changefinder/fix_test_invocation.patch
@@ -0,0 +1,13 @@
+diff --git a/test/test.py b/test/test.py
+index 85a9f4e..a5f44fd 100644
+--- a/test/test.py
++++ b/test/test.py
+@@ -4,7 +4,7 @@ import numpy as np
+ 
+ 
+ class TestChangeFinder():
+-    def setup(self):
++    def setup_method(self):
+         self._term = 30
+         self._smooth = 7
+         self._order = 1
diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index 09ecb4f986b5f..d9091be138fab 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Utilities for interfacing with Plotly's Chart Studio service";
     homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix
index 95e09e8db6e00..e19dd60a92693 100644
--- a/pkgs/development/python-modules/chat-downloader/default.nix
+++ b/pkgs/development/python-modules/chat-downloader/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/xenova/chat-downloader";
     changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index b4d7daab17aac..01773d1c20cfd 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -100,6 +100,6 @@ buildPythonPackage rec {
     mainProgram = "cheroot";
     homepage = "https://github.com/cherrypy/cheroot";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index f0f6ea8edcdeb..71d9a9aedfb56 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -126,6 +126,6 @@ buildPythonPackage rec {
     homepage = "https://cherrypy.dev/";
     changelog = "https://github.com/cherrypy/cherrypy/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix
index 3aeb0be954242..d87df6283746d 100644
--- a/pkgs/development/python-modules/cinemagoer/default.nix
+++ b/pkgs/development/python-modules/cinemagoer/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/cinemagoer/cinemagoer/";
     homepage = "https://cinemagoer.github.io/";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix
index 9f36998e98678..b87e4c42568b8 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/pkgs/development/python-modules/circus/default.nix
@@ -88,6 +88,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/circus-tent/circus";
     changelog = "https://github.com/circus-tent/circus/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cliche/default.nix b/pkgs/development/python-modules/cliche/default.nix
index 596ea43962b1a..4b0e63ed21c1c 100644
--- a/pkgs/development/python-modules/cliche/default.nix
+++ b/pkgs/development/python-modules/cliche/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage {
     mainProgram = "cliche";
     homepage = "https://github.com/kootenpv/cliche";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix
index 2d19a760e5fa6..47d43ca1fa2b4 100644
--- a/pkgs/development/python-modules/click-configfile/default.nix
+++ b/pkgs/development/python-modules/click-configfile/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Add support for commands that use configuration files to Click";
     homepage = "https://github.com/click-contrib/click-configfile";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix
index 348620d9106c6..fbf67e9b2a5f9 100644
--- a/pkgs/development/python-modules/click-log/default.nix
+++ b/pkgs/development/python-modules/click-log/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/click-contrib/click-log/";
     description = "Logging integration for Click";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix
index dd9ee1c021f26..c022a33608a48 100644
--- a/pkgs/development/python-modules/click-spinner/default.nix
+++ b/pkgs/development/python-modules/click-spinner/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/click-contrib/click-spinner";
     changelog = "https://github.com/click-contrib/click-spinner/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix
index cca72fa51ef0d..416a34be304d8 100644
--- a/pkgs/development/python-modules/cliff/default.nix
+++ b/pkgs/development/python-modules/cliff/default.nix
@@ -5,21 +5,21 @@
   autopage,
   cmd2,
   importlib-metadata,
-  installShellFiles,
   openstackdocstheme,
   pbr,
   prettytable,
   pyparsing,
   pyyaml,
+  setuptools,
   stevedore,
-  sphinx,
+  sphinxHook,
   callPackage,
 }:
 
 buildPythonPackage rec {
   pname = "cliff";
   version = "4.7.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -32,13 +32,15 @@ buildPythonPackage rec {
     rm test-requirements.txt
   '';
 
-  nativeBuildInputs = [
-    installShellFiles
+  build-system = [
     openstackdocstheme
-    sphinx
+    setuptools
+    sphinxHook
   ];
 
-  propagatedBuildInputs = [
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
     autopage
     cmd2
     importlib-metadata
@@ -49,11 +51,6 @@ buildPythonPackage rec {
     stevedore
   ];
 
-  postInstall = ''
-    sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man
-    installManPage doc/build/man/cliff.1
-  '';
-
   # check in passthru.tests.pytest to escape infinite recursion with stestr
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix
index 7c19348d32f0f..3b6e68710b4b0 100644
--- a/pkgs/development/python-modules/clifford/default.nix
+++ b/pkgs/development/python-modules/clifford/default.nix
@@ -68,7 +68,7 @@ buildPythonPackage rec {
     homepage = "https://clifford.readthedocs.io";
     changelog = "https://github.com/pygae/clifford/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # Broken with numba >= 0.54
     # see https://github.com/pygae/clifford/issues/430
     broken = versionAtLeast numba.version "0.58";
diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix
index 5fed44529a855..721b7cadb681a 100644
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sebageek/clintermission";
     changelog = "https://github.com/sebageek/clintermission/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix
index f87471c62c44e..fdd26fa0fd5e8 100644
--- a/pkgs/development/python-modules/clize/default.nix
+++ b/pkgs/development/python-modules/clize/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Command-line argument parsing for Python";
     homepage = "https://github.com/epsy/clize";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix
index 8765dc9e39f0b..1935151a7898d 100644
--- a/pkgs/development/python-modules/cloudflare/default.nix
+++ b/pkgs/development/python-modules/cloudflare/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
     mainProgram = "cli4";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix
index b957df2991d18..d8ebf82cf2768 100644
--- a/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/pkgs/development/python-modules/cloudpickle/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Extended pickling support for Python objects";
     homepage = "https://github.com/cloudpipe/cloudpickle";
     license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix
index bb2499c258bad..8fd6f490f0422 100644
--- a/pkgs/development/python-modules/cloudsmith-api/default.nix
+++ b/pkgs/development/python-modules/cloudsmith-api/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Cloudsmith API Client";
     homepage = "https://github.com/cloudsmith-io/cloudsmith-api";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix
index 3d21118aca376..e5564a7800b2c 100644
--- a/pkgs/development/python-modules/cloup/default.nix
+++ b/pkgs/development/python-modules/cloup/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff.
     '';
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix
index f5bec35c1c5b4..fb9835b8e87ae 100644
--- a/pkgs/development/python-modules/cma/default.nix
+++ b/pkgs/development/python-modules/cma/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";
     homepage = "https://github.com/CMA-ES/pycma";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cmsis-svd/default.nix b/pkgs/development/python-modules/cmsis-svd/default.nix
index 030b6d2822764..b3197b6f89ef5 100644
--- a/pkgs/development/python-modules/cmsis-svd/default.nix
+++ b/pkgs/development/python-modules/cmsis-svd/default.nix
@@ -2,33 +2,43 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   six,
+  lxml,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "cmsis-svd";
-  version = "0.4";
-  format = "setuptools";
+  version = "0.4-unstable-2024-01-25";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "posborne";
-    repo = pname;
-    rev = "python-${version}";
-    sha256 = "01f2z01gqgx0risqnbrlaqj49fmly30zbwsf7rr465ggnl2c04r0";
+    owner = "cmsis-svd";
+    repo = "cmsis-svd";
+    rev = "38d21d30abd0d4c2f34fd79d83b34392ed4bb7a3";
+    hash = "sha256-lFA0sNHVj4a4+EwOTmFUbM/nhmzJ4mx4GvT6Ykutakk=";
   };
 
-  preConfigure = ''
+  preBuild = ''
     cd python
   '';
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
 
-  pythonImportsCheck = [ "cmsis_svd" ];
+  dependencies = [
+    six
+    lxml
+  ];
 
-  meta = with lib; {
+  pythonImportsCheck = [
+    "cmsis_svd"
+    "cmsis_svd.parser"
+  ];
+
+  meta = {
     description = "CMSIS SVD parser";
-    homepage = "https://github.com/posborne/cmsis-svd";
-    maintainers = with maintainers; [ dump_stack ];
-    license = licenses.asl20;
+    homepage = "https://github.com/cmsis-svd/cmsis-svd";
+    maintainers = [ lib.maintainers.dump_stack ];
+    license = lib.licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix
index 6516cfce16878..d7f9b8a36fc82 100644
--- a/pkgs/development/python-modules/coincurve/default.nix
+++ b/pkgs/development/python-modules/coincurve/default.nix
@@ -81,6 +81,6 @@ buildPythonPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
index d907499cafeeb..901750de1fe8f 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/tartley/colorama";
     changelog = "https://github.com/tartley/colorama/raw/${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index dbffade58911a..b335897207fcf 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     mainProgram = "colorcet";
     homepage = "https://colorcet.pyviz.org";
     license = licenses.cc-by-40;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix
index c9db3719d3f0b..18306a65bb98b 100644
--- a/pkgs/development/python-modules/colored/default.nix
+++ b/pkgs/development/python-modules/colored/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     description = "Simple library for color and formatting to terminal";
     homepage = "https://gitlab.com/dslackw/colored";
     changelog = "https://gitlab.com/dslackw/colored/-/raw/${version}/CHANGES.md";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 0befe12cd88db..f5efbbf13486e 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jackparmer/colorlover";
     description = "Color scales in Python for humans";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix
index 130b6e908413a..f18517eca1e79 100644
--- a/pkgs/development/python-modules/comm/default.nix
+++ b/pkgs/development/python-modules/comm/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage {
     description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc";
     homepage = "https://github.com/ipython/comm";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix
index defdc1aa3b059..f410d16628f4c 100644
--- a/pkgs/development/python-modules/commentjson/default.nix
+++ b/pkgs/development/python-modules/commentjson/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Add JavaScript or Python style comments in JSON";
     homepage = "https://github.com/vaidik/commentjson/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix
similarity index 74%
rename from pkgs/applications/version-management/commitizen/default.nix
rename to pkgs/development/python-modules/commitizen/default.nix
index 472a0e04b8c66..7f2870ae493c8 100644
--- a/pkgs/applications/version-management/commitizen/default.nix
+++ b/pkgs/development/python-modules/commitizen/default.nix
@@ -1,20 +1,39 @@
 { lib
 , commitizen
 , fetchFromGitHub
+, buildPythonPackage
 , git
-, python3
+, pythonOlder
 , stdenv
 , installShellFiles
+, poetry-core
 , nix-update-script
 , testers
+, argcomplete
+, charset-normalizer
+, colorama
+, decli
+, importlib-metadata
+, jinja2
+, packaging
+, pyyaml
+, questionary
+, termcolor
+, tomlkit
+, py
+, pytest-freezer
+, pytest-mock
+, pytest-regressions
+, pytest7CheckHook
+, deprecated
 }:
 
-python3.pkgs.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "commitizen";
   version = "3.28.0";
   format = "pyproject";
 
-  disabled = python3.pythonOlder "3.8";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "commitizen-tools";
@@ -28,12 +47,12 @@ python3.pkgs.buildPythonApplication rec {
     "decli"
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = [
     poetry-core
     installShellFiles
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     argcomplete
     charset-normalizer
     colorama
@@ -47,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
     tomlkit
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = [
     argcomplete
     deprecated
     git
@@ -60,6 +79,8 @@ python3.pkgs.buildPythonApplication rec {
 
   doCheck = true;
 
+  pythonImportsCheck = [ "commitizen" ];
+
   # The tests require a functional git installation
   # which requires a valid HOME directory.
   preCheck = ''
@@ -85,14 +106,14 @@ python3.pkgs.buildPythonApplication rec {
 
   postInstall =
     let
-      argcomplete = lib.getExe' python3.pkgs.argcomplete "register-python-argcomplete";
+      register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete";
     in
     lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
       ''
         installShellCompletion --cmd cz \
-          --bash <(${argcomplete} --shell bash $out/bin/cz) \
-          --zsh <(${argcomplete} --shell zsh $out/bin/cz) \
-          --fish <(${argcomplete} --shell fish $out/bin/cz)
+          --bash <(${register-python-argcomplete} --shell bash $out/bin/cz) \
+          --zsh <(${register-python-argcomplete} --shell zsh $out/bin/cz) \
+          --fish <(${register-python-argcomplete} --shell fish $out/bin/cz)
       '';
 
   passthru = {
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 8df7ef380ab34..7cc96f4d856f8 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/nexB/commoncode";
     changelog = "https://github.com/nexB/commoncode/blob/v${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix
index d318e031fb6d9..76cd8caa1a9ad 100644
--- a/pkgs/development/python-modules/compreffor/default.nix
+++ b/pkgs/development/python-modules/compreffor/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     mainProgram = "compreffor";
     homepage = "https://github.com/googlefonts/compreffor";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index 4c99fc866c5da..c2038f77e1bb4 100644
--- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix
@@ -9,15 +9,15 @@
 }:
 buildPythonPackage rec {
   pname = "conda-libmamba-solver";
-  version = "24.1.0";
+  version = "24.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     inherit pname version;
     owner = "conda";
     repo = "conda-libmamba-solver";
-    rev = version;
-    hash = "sha256-vsUYrDVNMKHd3mlaAFYCP4uPQ9HxeKsose5O8InaMcE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-HBbApS6hyIbRyxOpOwbC1+IalIYk17rYRo6HLcwKKW4=";
   };
 
 
diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index ad3ce46736112..02228f5f2fc03 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/DiffSK/configobj";
     changelog = "https://github.com/DiffSK/configobj/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index efe6362da4803..d078fceee371b 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Updated configparser from Python 3.7 for Python 2.6+";
     homepage = "https://github.com/jaraco/configparser";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix
index cc3c7002a4ec5..c2eabec513c23 100644
--- a/pkgs/development/python-modules/configshell/default.nix
+++ b/pkgs/development/python-modules/configshell/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Python library for building configuration shells";
     homepage = "https://github.com/open-iscsi/configshell-fb";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix
index 6b835fd44c567..dca06fcf55d64 100644
--- a/pkgs/development/python-modules/consonance/default.nix
+++ b/pkgs/development/python-modules/consonance/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "WhatsApp's handshake implementation using Noise Protocol";
     homepage = "https://github.com/tgalal/consonance";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 0e0b19ecdd500..89c328325499b 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -51,7 +51,7 @@ let
       description = "Module for symbolic constant support";
       homepage = "https://github.com/twisted/constantly";
       license = licenses.mit;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix
index 18b18e917d617..52d2ad50a43de 100644
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Backports and enhancements for the contextlib module";
     homepage = "https://contextlib2.readthedocs.org/";
     license = licenses.psfl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix
index 652fbbef7207b..4d668412f6745 100644
--- a/pkgs/development/python-modules/contourpy/default.nix
+++ b/pkgs/development/python-modules/contourpy/default.nix
@@ -77,7 +77,7 @@ let
       description = "Python library for calculating contours in 2D quadrilateral grids";
       homepage = "https://github.com/contourpy/contourpy";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/convertertools/default.nix b/pkgs/development/python-modules/convertertools/default.nix
index bf58e95a9e587..17739bd6619bb 100644
--- a/pkgs/development/python-modules/convertertools/default.nix
+++ b/pkgs/development/python-modules/convertertools/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bluetooth-devices/convertertools";
     changelog = "https://github.com/bluetooth-devices/convertertools/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix
index 454a2b7083cb1..f055b52ee2b41 100644
--- a/pkgs/development/python-modules/coordinates/default.nix
+++ b/pkgs/development/python-modules/coordinates/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/clbarnes/coordinates";
     changelog = "https://github.com/clbarnes/coordinates/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix
index ad172b2961167..d620f6fb4e22a 100644
--- a/pkgs/development/python-modules/coreapi/default.nix
+++ b/pkgs/development/python-modules/coreapi/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Python client library for Core API";
     homepage = "https://github.com/core-api/python-client";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix
index 8d597e530383e..1aede8b9f5873 100644
--- a/pkgs/development/python-modules/coreschema/default.nix
+++ b/pkgs/development/python-modules/coreschema/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Python client library for Core Schema";
     homepage = "https://github.com/ivegotasthma/python-coreschema";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix
index 5b0df404ee775..e6c1395785629 100644
--- a/pkgs/development/python-modules/crashtest/default.nix
+++ b/pkgs/development/python-modules/crashtest/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sdispater/crashtest";
     description = "Manage Python errors with ease";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix
index 2bf31ea69c81a..63f6e570d71a5 100644
--- a/pkgs/development/python-modules/crccheck/default.nix
+++ b/pkgs/development/python-modules/crccheck/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage {
     description = "Python library for CRCs and checksums";
     homepage = "https://github.com/MartinScharrer/crccheck";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 930cbedd56cfb..97987cda532de 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/LuminalOSS/credstash";
     changelog = "https://github.com/fugue/credstash/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "credstash";
   };
 }
diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix
index 00f59b7990e6c..eb2a088653590 100644
--- a/pkgs/development/python-modules/croniter/default.nix
+++ b/pkgs/development/python-modules/croniter/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kiorky/croniter";
     changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix
index 2c2bad80e21bf..9fe0ad7acaeba 100644
--- a/pkgs/development/python-modules/cryptodatahub/default.nix
+++ b/pkgs/development/python-modules/cryptodatahub/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/coroner/cryptodatahub";
     changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${version}/CHANGELOG.rst";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix
index a85aa4345c543..41dfed02e7164 100644
--- a/pkgs/development/python-modules/cssselect/default.nix
+++ b/pkgs/development/python-modules/cssselect/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     homepage = "https://cssselect.readthedocs.io/";
     changelog = "https://github.com/scrapy/cssselect/v${version}//CHANGES";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix
index 0eabd5ca83235..3f92e6567f136 100644
--- a/pkgs/development/python-modules/cssselect2/default.nix
+++ b/pkgs/development/python-modules/cssselect2/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Kozea/cssselect2";
     changelog = "https://github.com/Kozea/cssselect2/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix
index d37d7819ec37c..be429844d13d6 100644
--- a/pkgs/development/python-modules/csvw/default.nix
+++ b/pkgs/development/python-modules/csvw/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     description = "CSV on the Web";
     homepage = "https://github.com/cldf/csvw";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix
index 8cc3b4a34bb53..27faeab92bd43 100644
--- a/pkgs/development/python-modules/cu2qu/default.nix
+++ b/pkgs/development/python-modules/cu2qu/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     mainProgram = "cu2qu";
     homepage = "https://github.com/googlefonts/cu2qu";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index 9e2e8df44a003..6f550580a208a 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "Productivity Tools for Plotly + Pandas";
     homepage = "https://github.com/santosjorge/cufflinks";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix
index 10bd11bc849ca..8ff358be69058 100644
--- a/pkgs/development/python-modules/curve25519-donna/default.nix
+++ b/pkgs/development/python-modules/curve25519-donna/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "Python wrapper for the portable curve25519-donna implementation";
     homepage = "http://code.google.com/p/curve25519-donna/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index b01a4f7242711..75b8b091c39b4 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sebastinas/cwcwidth";
     changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix
index 854e75f08b56d..44dc7e32fd4bb 100644
--- a/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/pkgs/development/python-modules/cx-freeze/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     homepage = "https://marcelotduarte.github.io/cx_Freeze/";
     changelog = "https://github.com/marcelotduarte/cx_Freeze/releases/tag/${version}";
     license = licenses.psfl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "cxfreeze";
   };
 }
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 2b60de8fd4e5a..53637a465aee7 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -35,8 +35,9 @@ buildPythonPackage rec {
     hash = "sha256-yBBtE9DfHzUNXHMCo3KoUAAsvkBshczmVtMCUTtQ9zg=";
   };
 
-  build-system = [ poetry-core ];
+  pythonRelaxDeps = [ "py-serializable" ];
 
+  build-system = [ poetry-core ];
 
   dependencies = [
     importlib-metadata
@@ -51,18 +52,27 @@ buildPythonPackage rec {
     types-toml
   ];
 
+  passthru.optional-dependencies = {
+    validation = [
+      jsonschema
+      lxml
+    ];
+    json-validation = [
+      jsonschema
+    ];
+    xml-validation = [
+      lxml
+    ];
+  };
+
   nativeCheckInputs = [
     ddt
-    jsonschema
-    lxml
     pytestCheckHook
     xmldiff
-  ];
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   pythonImportsCheck = [ "cyclonedx" ];
 
-  pythonRelaxDeps = [ "py-serializable" ];
-
   preCheck = ''
     export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH}
   '';
@@ -82,12 +92,6 @@ buildPythonPackage rec {
     "tests/test_output_xml.py"
   ];
 
-  passthru.optional-dependencies = {
-    validation = [
-      jsonschema
-    ];
-  };
-
   meta = with lib; {
     description = "Python library for generating CycloneDX SBOMs";
     homepage = "https://github.com/CycloneDX/cyclonedx-python-lib";
diff --git a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
index 66adf36686001..70a2746b1c60b 100644
--- a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
+++ b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
       publicDomain
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/daiquiri/default.nix b/pkgs/development/python-modules/daiquiri/default.nix
index 735131d935f7b..172253d600887 100644
--- a/pkgs/development/python-modules/daiquiri/default.nix
+++ b/pkgs/development/python-modules/daiquiri/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Library to configure Python logging easily";
     homepage = "https://github.com/Mergifyio/daiquiri";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 0965dacd42326..aee5251191170 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/django/daphne";
     changelog = "https://github.com/django/daphne/blob/${version}/CHANGELOG.txt";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "daphne";
   };
 }
diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix
index e8dfaf086b963..fe38977f2ac06 100644
--- a/pkgs/development/python-modules/darkdetect/default.nix
+++ b/pkgs/development/python-modules/darkdetect/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Detect OS Dark Mode from Python";
     homepage = "https://github.com/albertosottile/darkdetect";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix
index 9d90d292ea7a6..8935e536996af 100644
--- a/pkgs/development/python-modules/dask-gateway-server/default.nix
+++ b/pkgs/development/python-modules/dask-gateway-server/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Multi-tenant server for securely deploying and managing multiple Dask clusters";
     homepage = "https://gateway.dask.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix
index 79a1d54f4dc70..b3f63835c3a4f 100644
--- a/pkgs/development/python-modules/dask-gateway/default.nix
+++ b/pkgs/development/python-modules/dask-gateway/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Client library for interacting with a dask-gateway server";
     homepage = "https://gateway.dask.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index ec4c90b5de919..a4bead52b43ba 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     description = "Generalized Linear Models with Dask";
     homepage = "https://github.com/dask/dask-glm/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix
index 2bd7d06003c94..f51dccdc0377d 100644
--- a/pkgs/development/python-modules/dask-mpi/default.nix
+++ b/pkgs/development/python-modules/dask-mpi/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     mainProgram = "dask-mpi";
     homepage = "https://github.com/dask/dask-mpi";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix
index 44e356bdf13fe..33fd15cded4b1 100644
--- a/pkgs/development/python-modules/databases/default.nix
+++ b/pkgs/development/python-modules/databases/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/encode/databases";
     changelog = "https://github.com/encode/databases/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix
index b020a279a0fc6..926f8a9f08a16 100644
--- a/pkgs/development/python-modules/datadiff/default.nix
+++ b/pkgs/development/python-modules/datadiff/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Library to provide human-readable diffs of Python data structures";
     homepage = "https://sourceforge.net/projects/datadiff/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 5103cc4df9477..185aef5688b3d 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/DataDog/datadogpy";
     changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix
index 8ab7fd4c0bcc0..e7c8f0b3af2cb 100644
--- a/pkgs/development/python-modules/datamodeldict/default.nix
+++ b/pkgs/development/python-modules/datamodeldict/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML";
     homepage = "https://github.com/usnistgov/DataModelDict/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix
index 3718c4db7eab4..14779ee62cabc 100644
--- a/pkgs/development/python-modules/datasets/default.nix
+++ b/pkgs/development/python-modules/datasets/default.nix
@@ -70,6 +70,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/huggingface/datasets/releases/tag/${version}";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index d5976e2a92915..fd31d3bbf1897 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -102,6 +102,6 @@ buildPythonPackage rec {
     homepage = "https://datasette.io/";
     changelog = "https://github.com/simonw/datasette/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 1fc9b1e80de05..c7e3237a1f65e 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -96,6 +96,6 @@ buildPythonPackage rec {
     mainProgram = "datashader";
     homepage = "https://datashader.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index 9dbe3654a4019..f52c467fd3dd2 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Utilities for working with datetime objects";
     homepage = "https://github.com/jmcantrell/python-dateutils";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index 639b8baa21578..997600122d01f 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension";
     homepage = "https://github.com/pytries/DAWG-Python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix
index 0b6eb890fb601..4f7eff5b9a732 100644
--- a/pkgs/development/python-modules/db-dtypes/default.nix
+++ b/pkgs/development/python-modules/db-dtypes/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-db-dtypes-pandas";
     changelog = "https://github.com/googleapis/python-db-dtypes-pandas/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix
index 760f5c8d50588..0be997c9fc2ad 100644
--- a/pkgs/development/python-modules/dbf/default.nix
+++ b/pkgs/development/python-modules/dbf/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Module for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files";
     homepage = "https://github.com/ethanfurman/dbf";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
index 0f8b29bce1102..26d8046ea8f25 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "Read DBF Files with Python";
     homepage = "https://dbfread.readthedocs.org/";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index 04e52796cf807..776725659d691 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dbt-labs/dbt-adapters";
     changelog = "https://github.com/dbt-labs/dbt-adapters/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 22bd2e40799d5..bf9a93abafab6 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dbt-labs/dbt-common";
     changelog = "https://github.com/dbt-labs/dbt-common/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix
index f49197cc90fcd..3f455b68a9612 100644
--- a/pkgs/development/python-modules/dbus-deviation/default.nix
+++ b/pkgs/development/python-modules/dbus-deviation/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     homepage = "https://tecnocode.co.uk/dbus-deviation/";
     description = "Project for parsing D-Bus introspection XML and processing it in various ways";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dbus-python/default.nix b/pkgs/development/python-modules/dbus-python/default.nix
index 937ec9511ef5e..b6664daa25768 100644
--- a/pkgs/development/python-modules/dbus-python/default.nix
+++ b/pkgs/development/python-modules/dbus-python/default.nix
@@ -100,7 +100,7 @@ lib.fix (
       homepage = "https://gitlab.freedesktop.org/dbus/dbus-python";
       license = licenses.mit;
       platforms = dbus.meta.platforms;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   }
 )
diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix
index cbe1451875073..541ac2a3cdda0 100644
--- a/pkgs/development/python-modules/ddt/default.nix
+++ b/pkgs/development/python-modules/ddt/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/datadriventests/ddt/releases/tag/${version}";
     description = "Data-Driven/Decorated Tests, a library to multiply test cases";
     homepage = "https://github.com/txels/ddt";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix
index 5174c46c444a8..d9b2011b17f2f 100644
--- a/pkgs/development/python-modules/debtcollector/default.nix
+++ b/pkgs/development/python-modules/debtcollector/default.nix
@@ -2,8 +2,11 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  openstackdocstheme,
   pbr,
   six,
+  setuptools,
+  sphinxHook,
   wrapt,
   callPackage,
 }:
@@ -11,16 +14,23 @@
 buildPythonPackage rec {
   pname = "debtcollector";
   version = "3.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-KokX0lsOHx0NNl08HG7Px6UiselxbooaSpFRJvfM6m8=";
   };
 
-  nativeBuildInputs = [ pbr ];
+  build-system = [
+    openstackdocstheme
+    pbr
+    setuptools
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     six
     wrapt
   ];
diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index 0836e284a9081..5a0bc26763a46 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/micheles/decorator";
     description = "Better living through Python with decorators";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix
index 6e2c89df3a19b..40ee84f52aa21 100644
--- a/pkgs/development/python-modules/deemix/default.nix
+++ b/pkgs/development/python-modules/deemix/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Deezer downloader built from the ashes of Deezloader Remix";
     mainProgram = "deemix";
-    homepage = "https://git.freezerapp.xyz/RemixDev/deemix-py";
+    homepage = "https://gitlab.com/RemixDev/deemix-py";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ natto1784 ];
   };
diff --git a/pkgs/development/python-modules/dek/default.nix b/pkgs/development/python-modules/dek/default.nix
index 811c406480a15..4f528b8551339 100644
--- a/pkgs/development/python-modules/dek/default.nix
+++ b/pkgs/development/python-modules/dek/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/rec/dek";
     changelog = "https://github.com/rec/dek/blob/${src.rev}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix
index b51ff537518cd..0e4fc71161a79 100644
--- a/pkgs/development/python-modules/delegator-py/default.nix
+++ b/pkgs/development/python-modules/delegator-py/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Subprocesses for Humans 2.0";
     homepage = "https://github.com/amitt001/delegator.py";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix
index c7e67c6eaaf5f..a3fbc61e2c042 100644
--- a/pkgs/development/python-modules/derpconf/default.nix
+++ b/pkgs/development/python-modules/derpconf/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/globocom/derpconf";
     changelog = "https://github.com/globocom/derpconf/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix
index a678a2bb69dec..820e204e118a4 100644
--- a/pkgs/development/python-modules/detect-secrets/default.nix
+++ b/pkgs/development/python-modules/detect-secrets/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     description = "Enterprise friendly way of detecting and preventing secrets in code";
     homepage = "https://github.com/Yelp/detect-secrets";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix
index 93ce2b7de1386..7c7936ec88166 100644
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/diff-match-patch-python/diff-match-patch";
     description = "Diff, Match and Patch libraries for Plain Text";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index c2cb7a49df137..023b14113622b 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://discordpy.rtfd.org/";
     changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix
index 4fe4bad03abc6..c2a18535a7634 100644
--- a/pkgs/development/python-modules/diskcache/default.nix
+++ b/pkgs/development/python-modules/diskcache/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "Disk and file backed persistent cache";
     homepage = "http://www.grantjenks.com/docs/diskcache/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index 9c4a7a9e70ab3..0de0aee0c165f 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Linux Distribution - a Linux OS platform information API";
     mainProgram = "distro";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index aec84b9102911..aee96dfd6cc7c 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jazzband/dj-database-url";
     changelog = "https://github.com/jazzband/dj-database-url/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix
index e557c9992717b..1214234bf8dd1 100644
--- a/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/pkgs/development/python-modules/dj-email-url/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Use an URL to configure email backend settings in your Django Application";
     homepage = "https://github.com/migonzalvar/dj-email-url";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix
index 49e0c49e75bb1..1f0ac3747c878 100644
--- a/pkgs/development/python-modules/dj-rest-auth/default.nix
+++ b/pkgs/development/python-modules/dj-rest-auth/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/iMerica/dj-rest-auth";
     changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix
index 92d2bf2355603..e2a0a47a7f90f 100644
--- a/pkgs/development/python-modules/django-celery-results/default.nix
+++ b/pkgs/development/python-modules/django-celery-results/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/celery/django-celery-results";
     changelog = "https://github.com/celery/django-celery-results/blob/v{version}/Changelog";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-classy-tags/default.nix b/pkgs/development/python-modules/django-classy-tags/default.nix
index 3f4fd07ae08b4..a115015facee7 100644
--- a/pkgs/development/python-modules/django-classy-tags/default.nix
+++ b/pkgs/development/python-modules/django-classy-tags/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/divio/django-classy-tags";
     changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix
index 5200ef0afc07e..a7c944f981678 100644
--- a/pkgs/development/python-modules/django-configurations/default.nix
+++ b/pkgs/development/python-modules/django-configurations/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     mainProgram = "django-cadmin";
     homepage = "https://django-configurations.readthedocs.io/";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix
index 27c0974e2311c..6271f6ade6f41 100644
--- a/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/pkgs/development/python-modules/django-cors-headers/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers";
     homepage = "https://github.com/OttoYiu/django-cors-headers";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix
index c9111e8be76cd..a6727b8f055b8 100644
--- a/pkgs/development/python-modules/django-guardian/default.nix
+++ b/pkgs/development/python-modules/django-guardian/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       mit
       bsd2
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index 122df1713ddc5..f74215dd1e8d5 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     description = "Pluggable search for Django";
     homepage = "http://haystacksearch.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index 6cde0dae20cb7..52f1ff4d5b4c3 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "django-import-export";
-  version = "4.0.9";
+  version = "4.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "django-import-export";
     repo = "django-import-export";
     rev = "refs/tags/${version}";
-    hash = "sha256-T7XnPxvqnLI3rd0xSZb2iOsgcOqiA/JrRh3rjCm5gG4=";
+    hash = "sha256-kD/9cpFqjipP3onMHCfimu0ffzGQAoEspjc4IfyuZak=";
   };
 
   pythonRelaxDeps = [ "tablib" ];
diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix
index 8a10b0675b46a..b778e0a93d7d0 100644
--- a/pkgs/development/python-modules/django-ipware/default.nix
+++ b/pkgs/development/python-modules/django-ipware/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/un33k/django-ipware";
     changelog = "https://github.com/un33k/django-ipware/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix
index 99e7e47ca8b68..628cae9403d29 100644
--- a/pkgs/development/python-modules/django-leaflet/default.nix
+++ b/pkgs/development/python-modules/django-leaflet/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/makinacorpus/django-leaflet";
     changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix
index 14b53943eb90f..1dbbeff2cb933 100644
--- a/pkgs/development/python-modules/django-model-utils/default.nix
+++ b/pkgs/development/python-modules/django-model-utils/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Django model mixins and utilities";
     changelog = "https://github.com/jazzband/django-model-utils/blob/${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix
index 67395fa588e88..fa38355d1ebcf 100644
--- a/pkgs/development/python-modules/django-otp/default.nix
+++ b/pkgs/development/python-modules/django-otp/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/django-otp/django-otp/blob/${src.rev}/CHANGES.rst";
     description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index 7feb6338397bf..29a5bab572c82 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Pickled object field for Django";
     homepage = "https://github.com/gintas/django-picklefield";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index 9030630a784a1..b313276bbf6b6 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/django-polymorphic/django-polymorphic";
     description = "Improved Django model inheritance with automatic downcasting";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index e1282e8802d01..d3fb086fc4174 100644
--- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jimfunk/django-postgresql-netfields";
     changelog = "https://github.com/jimfunk/django-postgresql-netfields/blob/v${version}/CHANGELOG";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix
index 3757f96c672b9..316b07a274e0a 100644
--- a/pkgs/development/python-modules/django-rest-auth/default.nix
+++ b/pkgs/development/python-modules/django-rest-auth/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Django app that makes registration and authentication easy";
     homepage = "https://github.com/Tivix/django-rest-auth";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/pkgs/development/python-modules/django-rest-polymorphic/default.nix
index 8430161948225..73196ccfbcf00 100644
--- a/pkgs/development/python-modules/django-rest-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-rest-polymorphic/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Polymorphic serializers for Django REST Framework";
     homepage = "https://github.com/apirobot/django-rest-polymorphic";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix
index 4513056064aa4..9d795c9346474 100644
--- a/pkgs/development/python-modules/django-reversion/default.nix
+++ b/pkgs/development/python-modules/django-reversion/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/etianen/django-reversion";
     changelog = "https://github.com/etianen/django-reversion/blob/v${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix
index 523e155a68c5c..bbcf238a10f21 100644
--- a/pkgs/development/python-modules/django-types/default.nix
+++ b/pkgs/development/python-modules/django-types/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Type stubs for Django";
     homepage = "https://github.com/sbdchd/django-types";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
index 3e036dfe98a92..1c1a0c14740da 100644
--- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Camel case JSON support for Django REST framework";
     homepage = "https://github.com/vbabiy/djangorestframework-camel-case";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
index 51c169ab929cb..3fa7cbb024906 100644
--- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = " Dataclasses serializer for Django REST framework";
     homepage = "https://github.com/oxan/djangorestframework-dataclasses";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
index d04cd24f54f9b..4d4a1d45fc9c1 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     description = "Django-guardian support for Django REST Framework";
     homepage = "https://github.com/rpkilby/django-rest-framework-guardian";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # unmaintained, last compatible version is 3.x, use djangorestframework-guardian2 instead
     broken = lib.versionAtLeast django.version "4";
   };
diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix
index cc75d77a4839f..cdb68b5164f3a 100644
--- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = " Recursive Serialization for Django REST framework";
     homepage = "https://github.com/heywbj/django-rest-framework-recursive";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix
index af8c7bdbee7f8..8295c2de2b96a 100644
--- a/pkgs/development/python-modules/dm-control/default.nix
+++ b/pkgs/development/python-modules/dm-control/default.nix
@@ -3,11 +3,14 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   absl-py,
   mujoco,
   pyparsing,
   setuptools,
-  wheel,
+
+  # dependencies
   dm-env,
   dm-tree,
   fsspec,
@@ -15,8 +18,6 @@
   h5py,
   lxml,
   mock,
-  nose,
-  nose-xunitmp,
   numpy,
   pillow,
   protobuf,
@@ -29,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "dm-control";
-  version = "1.0.20";
+  version = "1.0.21";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +39,7 @@ buildPythonPackage rec {
     owner = "google-deepmind";
     repo = "dm_control";
     rev = "refs/tags/${version}";
-    hash = "sha256-huXvfQz7E+OCqRrhLC5dUaG/A2PQXrPBzseIFx7ZIeE=";
+    hash = "sha256-yY75QpvZ0fAW2W0GVM7fzmXKmTdDyukCVC/1cyU5IjQ=";
   };
 
   build-system = [
@@ -46,7 +47,6 @@ buildPythonPackage rec {
     mujoco
     pyparsing
     setuptools
-    wheel
   ];
 
   pythonRemoveDeps = [
@@ -64,8 +64,6 @@ buildPythonPackage rec {
     lxml
     mock
     mujoco
-    nose
-    nose-xunitmp
     numpy
     pillow
     protobuf
diff --git a/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch b/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch
new file mode 100644
index 0000000000000..ac51e3bd50d15
--- /dev/null
+++ b/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch
@@ -0,0 +1,21 @@
+diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
+index 4fd1b1a..2d1d9d3 100644
+--- a/tree/CMakeLists.txt
++++ b/tree/CMakeLists.txt
+@@ -40,16 +40,6 @@ if (NOT (WIN32 OR MSVC))
+   endif()
+ endif()
+ 
+-if(APPLE)
+-  # On MacOS:
+-  #   -undefined dynamic_lookup is necessary for pybind11 linking
+-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything -w -undefined dynamic_lookup")
+-
+-  # On MacOS, we need this so that CMake will use the right Python if the user
+-  # has a virtual environment active
+-  set (CMAKE_FIND_FRAMEWORK LAST)
+-endif()
+-
+ # Fetch pybind to be able to use pybind11_add_module symbol.
+ set(PYBIND_VER v2.10.1)
+ include(FetchContent)
diff --git a/pkgs/development/python-modules/dm-tree/cmake.patch b/pkgs/development/python-modules/dm-tree/cmake.patch
deleted file mode 100644
index 28f201a30f71b..0000000000000
--- a/pkgs/development/python-modules/dm-tree/cmake.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt
-index 4fd1b1a..f0d072b 100644
---- a/tree/CMakeLists.txt
-+++ b/tree/CMakeLists.txt
-@@ -50,70 +50,79 @@ if(APPLE)
-   set (CMAKE_FIND_FRAMEWORK LAST)
- endif()
- 
--# Fetch pybind to be able to use pybind11_add_module symbol.
--set(PYBIND_VER v2.10.1)
--include(FetchContent)
--FetchContent_Declare(
--  pybind11
--  GIT_REPOSITORY https://github.com/pybind/pybind11
--  GIT_TAG        ${PYBIND_VER}
--)
--if(NOT pybind11_POPULATED)
--    FetchContent_Populate(pybind11)
--    add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
--    include_directories(${pybind11_INCLUDE_DIR})
--endif()
--
--# Needed to disable Abseil tests.
--set (BUILD_TESTING OFF)
--
--# Include abseil-cpp.
--set(ABSEIL_VER 20210324.2)
--include(ExternalProject)
--set(ABSEIL_CMAKE_ARGS
--    "-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/abseil-cpp"
--    "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
--    "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
--    "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
--    "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
--    "-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}"
--    "-DLIBRARY_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/abseil-cpp/lib")
--if(DEFINED CMAKE_OSX_ARCHITECTURES)
--    set(ABSEIL_CMAKE_ARGS
--        ${ABSEIL_CMAKE_ARGS}
--        "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
-+find_package(pybind11 CONFIG)
-+
-+if (NOT pybind11_FOUND)
-+  # Fetch pybind to be able to use pybind11_add_module symbol.
-+  set(PYBIND_VER v2.10.1)
-+  include(FetchContent)
-+  FetchContent_Declare(
-+    pybind11
-+    GIT_REPOSITORY https://github.com/pybind/pybind11
-+    GIT_TAG        ${PYBIND_VER}
-+  )
-+  if(NOT pybind11_POPULATED)
-+      FetchContent_Populate(pybind11)
-+      add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
-+      include_directories(${pybind11_INCLUDE_DIR})
-+  endif()
- endif()
--ExternalProject_Add(abseil-cpp
--  GIT_REPOSITORY    https://github.com/abseil/abseil-cpp.git
--  GIT_TAG           ${ABSEIL_VER}
--  PREFIX            ${CMAKE_SOURCE_DIR}/abseil-cpp
--  CMAKE_ARGS        ${ABSEIL_CMAKE_ARGS}
--)
--ExternalProject_Get_Property(abseil-cpp install_dir)
--set(abseil_install_dir ${install_dir})
--include_directories (${abseil_install_dir}/include)
--
- 
- # Define pybind11 tree module.
- pybind11_add_module(_tree tree.h tree.cc)
--add_dependencies(_tree abseil-cpp)
--
-+find_package(absl)
-+
-+if (NOT absl_FOUND)
-+  # Needed to disable Abseil tests.
-+  set (BUILD_TESTING OFF)
-+
-+  # Include abseil-cpp.
-+  set(ABSEIL_VER 20210324.2)
-+  include(ExternalProject)
-+  set(ABSEIL_CMAKE_ARGS
-+      "-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/abseil-cpp"
-+      "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}"
-+      "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-+      "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
-+      "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
-+      "-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}"
-+      "-DLIBRARY_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/abseil-cpp/lib")
-+  if(DEFINED CMAKE_OSX_ARCHITECTURES)
-+      set(ABSEIL_CMAKE_ARGS
-+          ${ABSEIL_CMAKE_ARGS}
-+          "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
-+  endif()
-+  ExternalProject_Add(abseil-cpp
-+    GIT_REPOSITORY    https://github.com/abseil/abseil-cpp.git
-+    GIT_TAG           ${ABSEIL_VER}
-+    PREFIX            ${CMAKE_SOURCE_DIR}/abseil-cpp
-+    CMAKE_ARGS        ${ABSEIL_CMAKE_ARGS}
-+  )
-+  ExternalProject_Get_Property(abseil-cpp install_dir)
-+  set(abseil_install_dir ${install_dir})
-+  include_directories (${abseil_install_dir}/include)
-+
-+  add_dependencies(_tree abseil-cpp)
-+
-+  if (WIN32 OR MSVC)
-+      set(ABSEIL_LIB_PREF "absl")
-+      set(LIB_SUFF "lib")
-+  else()
-+      set(ABSEIL_LIB_PREF "libabsl")
-+      set(LIB_SUFF "a")
-+  endif()
-+
--if (WIN32 OR MSVC)
--    set(ABSEIL_LIB_PREF "absl")
--    set(LIB_SUFF "lib")
-+  # Link abseil static libs.
-+  # We don't use find_library here to force cmake to build abseil before linking.
-+  set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)
-+  foreach(ABSEIL_LIB IN LISTS ABSEIL_LIBS)
-+    target_link_libraries(_tree PRIVATE
-+        "${abseil_install_dir}/lib/${ABSEIL_LIB_PREF}_${ABSEIL_LIB}.${LIB_SUFF}")
-+  endforeach()
- else()
--    set(ABSEIL_LIB_PREF "libabsl")
--    set(LIB_SUFF "a")
-+  target_link_libraries(_tree PRIVATE absl::int128 absl::raw_hash_set absl::raw_logging_internal absl::strings absl::throw_delegate)
- endif()
- 
--# Link abseil static libs.
--# We don't use find_library here to force cmake to build abseil before linking.
--set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate)
--foreach(ABSEIL_LIB IN LISTS ABSEIL_LIBS)
--  target_link_libraries(_tree PRIVATE
--      "${abseil_install_dir}/lib/${ABSEIL_LIB_PREF}_${ABSEIL_LIB}.${LIB_SUFF}")
--endforeach()
--
- # Make the module private to tree package.
- set_target_properties(_tree PROPERTIES OUTPUT_NAME tree/_tree)
- 
diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix
index 0cf64bc5da029..6062d202a3ce7 100644
--- a/pkgs/development/python-modules/dm-tree/default.nix
+++ b/pkgs/development/python-modules/dm-tree/default.nix
@@ -1,21 +1,42 @@
 {
+  lib,
+  buildPythonPackage,
+  fetchpatch,
+  fetchFromGitHub,
   stdenv,
+
+  # nativeBuildInputs
+  cmake,
+  pybind11,
+
+  # buildInputs
   abseil-cpp,
+
+  # build-system
+  setuptools,
+
+  # checks
   absl-py,
   attrs,
-  buildPythonPackage,
-  cmake,
-  fetchFromGitHub,
-  lib,
   numpy,
-  pybind11,
   wrapt,
 }:
-
+let
+  patchCMakeAbseil = fetchpatch {
+    name = "0001-don-t-rebuild-abseil.patch";
+    url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0001-don-t-rebuild-abseil.patch";
+    hash = "sha256-bho7lXAV5xHkPmWy94THJtx+6i+px5w6xKKfThvBO/M=";
+  };
+  patchCMakePybind = fetchpatch {
+    name = "0002-don-t-fetch-pybind11.patch";
+    url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0002-don-t-fetch-pybind11.patch";
+    hash = "sha256-41XIouQ4Fm1yewaxK9erfcnkGBS6vgdvMm/DyF0rsKg=";
+  };
+in
 buildPythonPackage rec {
   pname = "dm-tree";
   version = "0.1.8";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deepmind";
@@ -24,7 +45,10 @@ buildPythonPackage rec {
     hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc=";
   };
 
-  patches = [ ./cmake.patch ];
+  patches = [
+    patchCMakeAbseil
+    patchCMakePybind
+  ] ++ (lib.optional stdenv.isDarwin ./0003-don-t-configure-apple.patch);
 
   dontUseCmakeConfigure = true;
 
@@ -38,6 +62,8 @@ buildPythonPackage rec {
     pybind11
   ];
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     absl-py
     attrs
@@ -47,12 +73,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "tree" ];
 
-  meta = with lib; {
-    broken = stdenv.isDarwin;
+  meta = {
     description = "Tree is a library for working with nested data structures";
     homepage = "https://github.com/deepmind/tree";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/google-deepmind/tree/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       samuela
       ndl
     ];
diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix
index 49a59efc7029e..65d908605b9e0 100644
--- a/pkgs/development/python-modules/dnslib/default.nix
+++ b/pkgs/development/python-modules/dnslib/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Simple library to encode/decode DNS wire-format packets";
     homepage = "https://github.com/paulc/dnslib";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index c26f5f656d4d2..7a36c27e8e223 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -73,6 +73,6 @@ buildPythonPackage rec {
     description = "API client for docker written in Python";
     homepage = "https://github.com/docker/docker-py";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix
index 199f73afeefed..d90710fc3d84b 100644
--- a/pkgs/development/python-modules/dockerspawner/default.nix
+++ b/pkgs/development/python-modules/dockerspawner/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jupyterhub/dockerspawner";
     changelog = "https://github.com/jupyterhub/dockerspawner/blob/${version}/docs/source/changelog.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix
index 20b77a521e410..2aeb00ebe324b 100644
--- a/pkgs/development/python-modules/docrep/default.nix
+++ b/pkgs/development/python-modules/docrep/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Python package for docstring repetition";
     homepage = "https://github.com/Chilipp/docrep";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix
index 2e08bfc613413..3e4569f3035a9 100644
--- a/pkgs/development/python-modules/dodgy/default.nix
+++ b/pkgs/development/python-modules/dodgy/default.nix
@@ -1,41 +1,40 @@
 {
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
   lib,
 
   # pythonPackages
   mock,
-  nose,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "dodgy";
   version = "0.2.1";
-  format = "setuptools";
-  disabled = !isPy3k;
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "landscapeio";
-    repo = pname;
+    repo = "dodgy";
     rev = version;
     sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     mock
-    nose
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    nosetests tests/test_checks.py
-  '';
+  pytestFlagsArray = [ "tests/test_checks.py" ];
 
-  meta = with lib; {
+  meta = {
     description = "Looks at Python code to search for things which look \"dodgy\" such as passwords or diffs";
     mainProgram = "dodgy";
     homepage = "https://github.com/landscapeio/dodgy";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kamadorueda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kamadorueda ];
   };
 }
diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix
index 8fa2509927bc3..c6b78aa0504b0 100644
--- a/pkgs/development/python-modules/dogpile-cache/default.nix
+++ b/pkgs/development/python-modules/dogpile-cache/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Caching front-end based on the Dogpile lock";
     homepage = "https://github.com/sqlalchemy/dogpile.cache";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index ae4babf0c222d..04067083b56aa 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -76,6 +76,6 @@ buildPythonPackage {
     description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications";
     homepage = "https://gitlab.com/dogtail/dogtail";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix
index 5e1db9ff7559e..f2eae14e99a97 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Knio/dominate/";
     changelog = "https://github.com/Knio/dominate/releases/tag/${version}";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix
index 8b74363689d07..072192a23b5d9 100644
--- a/pkgs/development/python-modules/dragonfly/default.nix
+++ b/pkgs/development/python-modules/dragonfly/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     description = "Speech recognition framework allowing powerful Python-based scripting";
     homepage = "https://github.com/dictation-toolbox/dragonfly";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
index af9246717692b..426a9e440013c 100644
--- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Serve self-contained distribution builds of Swagger UI and Redoc with Django";
     homepage = "https://github.com/tfranzel/drf-spectacular-sidecar";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix
index 9b957b53d4a0c..cb9adc54051d9 100644
--- a/pkgs/development/python-modules/drf-spectacular/default.nix
+++ b/pkgs/development/python-modules/drf-spectacular/default.nix
@@ -98,6 +98,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/tfranzel/drf-spectacular";
     changelog = "https://github.com/tfranzel/drf-spectacular/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix
index d6692b1f78b59..1463ae7880b9b 100644
--- a/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/pkgs/development/python-modules/drf-yasg/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Generation of Swagger/OpenAPI schemas for Django REST Framework";
     homepage = "https://github.com/axnsan12/drf-yasg";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix
index 3ab19124eb8ae..e2f2c295a37ae 100644
--- a/pkgs/development/python-modules/drms/default.nix
+++ b/pkgs/development/python-modules/drms/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "Access HMI, AIA and MDI data with Python";
     homepage = "https://github.com/sunpy/drms";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix
index 95939d5ad8e5a..345161c8350ff 100644
--- a/pkgs/development/python-modules/dugong/default.nix
+++ b/pkgs/development/python-modules/dugong/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
       psfl
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix
index 1c71b925e99c6..fe5fd07044cae 100644
--- a/pkgs/development/python-modules/duo-client/default.nix
+++ b/pkgs/development/python-modules/duo-client/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/duosecurity/duo_client_python";
     changelog = "https://github.com/duosecurity/duo_client_python/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index cbdc820633900..39dafd2a9aa6b 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/iterative/dvc-task";
     changelog = "https://github.com/iterative/dvc-task/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix
index f16d9d4d55d74..bd40c29d8dd09 100644
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://dyn.readthedocs.org";
     changelog = "https://github.com/dyninc/dyn-python/blob/${version}/HISTORY.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix
index df95a000ef972..9c801e132f8b0 100644
--- a/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/SmileyChris/easy-thumbnails";
     changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix
index 18e720fbc20ec..d19d378fde5d3 100644
--- a/pkgs/development/python-modules/easygui/default.nix
+++ b/pkgs/development/python-modules/easygui/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Very simple, very easy GUI programming in Python";
     homepage = "https://github.com/robertlugg/easygui";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/editor/default.nix b/pkgs/development/python-modules/editor/default.nix
index d2256da39545b..5cf8a6d2de331 100644
--- a/pkgs/development/python-modules/editor/default.nix
+++ b/pkgs/development/python-modules/editor/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/rec/editor";
     changelog = "https://github.com/rec/editor/blob/${src.rev}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix
index 8de9fda503670..fbc88f69d874a 100644
--- a/pkgs/development/python-modules/effect/default.nix
+++ b/pkgs/development/python-modules/effect/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://effect.readthedocs.io/";
     changelog = "https://github.com/python-effect/effect/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index b30a3706287a4..d8a89c437ade1 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sissaschool/elementpath";
     changelog = "https://github.com/sissaschool/elementpath/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index be4fd02424677..cefe2c87cd8a2 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://emcee.readthedocs.io/";
     changelog = "https://github.com/dfm/emcee/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix
index da51b198efd96..4cd481da50387 100644
--- a/pkgs/development/python-modules/empty-files/default.nix
+++ b/pkgs/development/python-modules/empty-files/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Null Object pattern for files";
     homepage = "https://github.com/approvals/EmptyFiles.Python";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix
index 4210283b3e251..bccb74b2f8378 100644
--- a/pkgs/development/python-modules/enrich/default.nix
+++ b/pkgs/development/python-modules/enrich/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Enrich adds few missing features to the wonderful rich library";
     homepage = "https://github.com/pycontribs/enrich";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index 20b44c5fbd88e..ad775b4a5772b 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Discover and load entry points from installed packages";
     homepage = "https://github.com/takluyver/entrypoints";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/et-xmlfile/default.nix b/pkgs/development/python-modules/et-xmlfile/default.nix
index 8d647852dfc3c..67d26aa36a070 100644
--- a/pkgs/development/python-modules/et-xmlfile/default.nix
+++ b/pkgs/development/python-modules/et-xmlfile/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://foss.heptapod.net/openpyxl/et_xmlfile";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix
index 355d6cd4fbaec..d9dc4fcd07532 100644
--- a/pkgs/development/python-modules/etcd/default.nix
+++ b/pkgs/development/python-modules/etcd/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Python etcd client that just works";
     homepage = "https://github.com/dsoprea/PythonEtcdClient";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix
index 31ff0eb6dcc84..e105afb48ae48 100644
--- a/pkgs/development/python-modules/etcd3/default.nix
+++ b/pkgs/development/python-modules/etcd3/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "Python client for the etcd API v3";
     homepage = "https://github.com/kragniz/python-etcd3";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix
index bb23e85534b8a..ffdad63476285 100644
--- a/pkgs/development/python-modules/etebase/default.nix
+++ b/pkgs/development/python-modules/etebase/default.nix
@@ -12,23 +12,39 @@
   openssl,
   Security,
   msgpack,
+  fetchpatch,
 }:
 
 buildPythonPackage rec {
   pname = "etebase";
-  version = "0.31.6";
+  version = "0.31.7";
 
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "etebase-py";
     rev = "v${version}";
-    hash = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q=";
+    hash = "sha256-ZNUUp/0fGJxL/Rt8sAZ864rg8uCcNybIYSk4POt0vqg=";
   };
 
+  # https://github.com/etesync/etebase-py/pull/54
+  patches = [
+    # fix python 3.12 build
+    (fetchpatch {
+      url = "https://github.com/etesync/etebase-py/commit/898eb3aca1d4eb30d4aeae15e35d0bc45dd7b3c8.patch";
+      hash = "sha256-0BDUTztiC4MiwwNEDFtfc5ruc69Qk+svepQZRixNJgA=";
+    })
+    # replace flapigen git dependency in Cargo.lock
+    (fetchpatch {
+      url = "https://github.com/etesync/etebase-py/commit/7e9e4244a144dd46383d8be950d3df79e28eb069.patch";
+      hash = "sha256-8EH8Sc3UnmuCrSwDf3+as218HiG2Ed3r+FCMrUi5YrI=";
+    })
+  ];
+
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-wrMNtcaLAsWBVeJbYbYo+Xmobl01lnUbR9NUqqUzUgU=";
+    hash = "sha256-We19laZd6b2fLSPNLegyNp0eQSeCvUJeTIXqvG7o08c=";
+    inherit patches;
   };
 
   format = "pyproject";
diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix
index c61159a4e1e7c..8227fb9536cc7 100644
--- a/pkgs/development/python-modules/etelemetry/default.nix
+++ b/pkgs/development/python-modules/etelemetry/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sensein/etelemetry-client";
     changelog = "https://github.com/sensein/etelemetry-client/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix
index 61ba458104597..2b5d280562084 100644
--- a/pkgs/development/python-modules/eth-abi/default.nix
+++ b/pkgs/development/python-modules/eth-abi/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Ethereum ABI utilities";
     homepage = "https://github.com/ethereum/eth-abi";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix
index 059fd610cb9a7..7be6722f233b6 100644
--- a/pkgs/development/python-modules/eth-account/default.nix
+++ b/pkgs/development/python-modules/eth-account/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Account abstraction library for web3.py";
     homepage = "https://github.com/ethereum/eth-account";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix
index 7d75ccf1655e4..c53e052b76fcb 100644
--- a/pkgs/development/python-modules/eth-hash/default.nix
+++ b/pkgs/development/python-modules/eth-hash/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Ethereum hashing function keccak256";
     homepage = "https://github.com/ethereum/eth-hash";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix
index 8ed0657104717..8175b2cfe7613 100644
--- a/pkgs/development/python-modules/eth-keyfile/default.nix
+++ b/pkgs/development/python-modules/eth-keyfile/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Tools for handling the encrypted keyfile format used to store private keys";
     homepage = "https://github.com/ethereum/eth-keyfile";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix
index e599a21546f0a..964f4f08326dc 100644
--- a/pkgs/development/python-modules/eth-keys/default.nix
+++ b/pkgs/development/python-modules/eth-keys/default.nix
@@ -71,6 +71,6 @@ buildPythonPackage rec {
     description = "Common API for Ethereum key operations";
     homepage = "https://github.com/ethereum/eth-keys";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix
index d70ede6773ca8..3bc8d7c35b836 100644
--- a/pkgs/development/python-modules/eth-rlp/default.nix
+++ b/pkgs/development/python-modules/eth-rlp/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "RLP definitions for common Ethereum objects";
     homepage = "https://github.com/ethereum/eth-rlp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
index 6e437a5418985..cbf0c4df19b9e 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ethereum/eth-typing";
     changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index c45aec172690f..2167c3e1abdde 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Common utility functions for codebases which interact with ethereum";
     homepage = "https://github.com/ethereum/eth-utils";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix
index 8b2be689737a2..ecf7fa96bc25f 100644
--- a/pkgs/development/python-modules/events/default.nix
+++ b/pkgs/development/python-modules/events/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://events.readthedocs.org";
     changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix
index 4d303a64c256b..9221ae0a16936 100644
--- a/pkgs/development/python-modules/exdown/default.nix
+++ b/pkgs/development/python-modules/exdown/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Extract code blocks from markdown";
     homepage = "https://github.com/nschloe/exdown";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix
index 16497817b44e5..942b5b761abd3 100644
--- a/pkgs/development/python-modules/exifread/default.nix
+++ b/pkgs/development/python-modules/exifread/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     mainProgram = "EXIF.py";
     homepage = "https://github.com/ianare/exif-py";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix
index 59608910e50fa..ba846ebbab32e 100644
--- a/pkgs/development/python-modules/expiring-dict/default.nix
+++ b/pkgs/development/python-modules/expiring-dict/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Python dict with TTL support for auto-expiring caches";
     homepage = "https://github.com/dparker2/py-expiring-dict";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/face-recognition/default.nix b/pkgs/development/python-modules/face-recognition/default.nix
index ff50cce91dad0..6385b51b936c7 100644
--- a/pkgs/development/python-modules/face-recognition/default.nix
+++ b/pkgs/development/python-modules/face-recognition/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     license = licenses.mit;
     homepage = "https://github.com/ageitgey/face_recognition";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     description = "World's simplest facial recognition api for Python and the command line";
   };
 }
diff --git a/pkgs/development/python-modules/face-recognition/models.nix b/pkgs/development/python-modules/face-recognition/models.nix
index ba704dbbeb043..cc7dbe6481ada 100644
--- a/pkgs/development/python-modules/face-recognition/models.nix
+++ b/pkgs/development/python-modules/face-recognition/models.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/ageitgey/face_recognition_models";
     license = licenses.cc0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     description = "Trained models for the face_recognition python library";
   };
 }
diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix
index 66aefe6671efa..b802b058df49c 100644
--- a/pkgs/development/python-modules/fastapi-cli/default.nix
+++ b/pkgs/development/python-modules/fastapi-cli/default.nix
@@ -54,7 +54,7 @@ let self = buildPythonPackage rec {
     changelog = "https://github.com/tiangolo/fastapi-cli/releases/tag/${version}";
     mainProgram = "fastapi";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 };
 in self
diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix
index 92eb19e0a0eec..195491ec8ab66 100644
--- a/pkgs/development/python-modules/fastbencode/default.nix
+++ b/pkgs/development/python-modules/fastbencode/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/breezy-team/fastbencode";
     changelog = "https://github.com/breezy-team/fastbencode/releases/tag/v${version}";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index c8e4bde9c55df..2dad1964f6087 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.5.55";
+  version = "1.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "fastcore";
     rev = "refs/tags/${version}";
-    hash = "sha256-PjJYlOXiH9PBjv9mNe3PuXC7S95JXqOHQtrYFezGBpk=";
+    hash = "sha256-dVzJtYnsezk7Pb5Y59BUY8TQ/3Z5JLntqjld2zJk6pA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix
index 9ddf94d5020aa..1096add5b6278 100644
--- a/pkgs/development/python-modules/fastdiff/default.nix
+++ b/pkgs/development/python-modules/fastdiff/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     description = "Fast native implementation of diff algorithm with a pure Python fallback";
     homepage = "https://github.com/syrusakbary/fastdiff";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # resulting compiled object panics at import
     broken = stdenv.is32bit;
   };
diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix
index 494a384849b9d..4460c71f3c314 100644
--- a/pkgs/development/python-modules/fasteners/default.nix
+++ b/pkgs/development/python-modules/fasteners/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/harlowja/fasteners";
     changelog = "https://github.com/harlowja/fasteners/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix
index 0b54f1022f05d..11d5ef13a2488 100644
--- a/pkgs/development/python-modules/fasttext/default.nix
+++ b/pkgs/development/python-modules/fasttext/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Python module for text classification and representation learning";
     homepage = "https://fasttext.cc/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
index d561911cd4d16..725150b18fb63 100644
--- a/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Standalone version of Django's feedgenerator module";
     homepage = "https://github.com/getpelican/feedgenerator";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix
index 17dde1d6701f2..2452a6cbf07de 100644
--- a/pkgs/development/python-modules/finalfusion/default.nix
+++ b/pkgs/development/python-modules/finalfusion/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for using finalfusion, word2vec, and fastText word embeddings";
     homepage = "https://github.com/finalfusion/finalfusion-python/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     license = licenses.blueOak100;
   };
diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix
new file mode 100644
index 0000000000000..d4a2752c8ea30
--- /dev/null
+++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix
@@ -0,0 +1,55 @@
+{
+  stdenv,
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pythonOlder,
+  pytestCheckHook,
+  torch,
+  pytorch-lightning,
+}:
+
+buildPythonPackage rec {
+  pname = "finetuning-scheduler";
+  version = "2.3.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "speediedan";
+    repo = "finetuning-scheduler";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Nci+NcfcaZV3NH3MTCyr8PwPdDykJTdq8+CmtngWdiM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pytorch-lightning
+    torch
+  ];
+
+  # needed while lightning is installed as package `pytorch-lightning` rather than`lightning`:
+  env.PACKAGE_NAME = "pytorch";
+
+  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "tests" ];
+  disabledTests = lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [
+    # slightly exceeds numerical tolerance on aarch64-linux:
+    "test_fts_frozen_bn_track_running_stats"
+  ];
+
+  pythonImportsCheck = [ "finetuning_scheduler" ];
+
+  meta = {
+    description = "PyTorch Lightning extension for foundation model experimentation with flexible fine-tuning schedules";
+    homepage = "https://finetuning-scheduler.readthedocs.io";
+    changelog = "https://github.com/speediedan/finetuning-scheduler/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    # "No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package" at import time:
+    broken = stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix
index cf12acd2ade1d..6b3bf80810f67 100644
--- a/pkgs/development/python-modules/fingerprints/default.nix
+++ b/pkgs/development/python-modules/fingerprints/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Library to generate entity fingerprints";
     homepage = "https://github.com/alephdata/fingerprints";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix
index dc9bee90b3cb6..0d6118e44c4e8 100644
--- a/pkgs/development/python-modules/firebase-messaging/default.nix
+++ b/pkgs/development/python-modules/firebase-messaging/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sdb9696/firebase-messaging";
     changelog = "https://github.com/sdb9696/firebase-messaging/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix
index a479e66246fd1..f53eba81b2ea1 100644
--- a/pkgs/development/python-modules/fitbit/default.nix
+++ b/pkgs/development/python-modules/fitbit/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Fitbit API Python Client Implementation";
     homepage = "https://github.com/orcasgit/python-fitbit";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix
index 476491873e4f9..ea860b563edb1 100644
--- a/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
       lgpl3
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix
index be5b422f1402b..7d52055c8956b 100644
--- a/pkgs/development/python-modules/flasgger/default.nix
+++ b/pkgs/development/python-modules/flasgger/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     description = "Easy OpenAPI specs and Swagger UI for your Flask API";
     homepage = "https://github.com/flasgger/flasgger/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index b35020f88ee28..64efa21f8ced2 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -80,7 +80,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/dpgaspar/flask-appbuilder/";
     changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940
     broken = true;
   };
diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix
index a34a1c2673b36..4c4e24aa7225c 100644
--- a/pkgs/development/python-modules/flask-bootstrap/default.nix
+++ b/pkgs/development/python-modules/flask-bootstrap/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mbr/flask-bootstrap";
     description = "Ready-to-use Twitter-bootstrap for use in Flask";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix
index e679bf16e8ebf..0f733a1b9a38c 100644
--- a/pkgs/development/python-modules/flask-caching/default.nix
+++ b/pkgs/development/python-modules/flask-caching/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Caching extension for Flask";
     homepage = "https://github.com/pallets-eco/flask-caching";
     changelog = "https://github.com/pallets-eco/flask-caching/blob/v${version}/CHANGES.rst";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
index 3ccf3d41fcbb4..77f07f3910a51 100644
--- a/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -91,6 +91,6 @@ buildPythonPackage rec {
     homepage = "https://flask-limiter.readthedocs.org/";
     changelog = "https://github.com/alisaifee/flask-limiter/blob/${version}/HISTORY.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix
index 32f8642212728..65ba830e91035 100644
--- a/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/pkgs/development/python-modules/flask-mongoengine/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mongoengine/flask-mongoengine";
     changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix
index ee15641a9d5cb..5624141f671d9 100644
--- a/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/pkgs/development/python-modules/flask-paginate/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/lixxu/flask-paginate";
     changelog = "https://github.com/lixxu/flask-paginate/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index e1f15d6fad0c1..55bb0160b49b1 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
       REST API.
     '';
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix
index 9541e74148ca6..07bb5cbe40b15 100644
--- a/pkgs/development/python-modules/flask-versioned/default.nix
+++ b/pkgs/development/python-modules/flask-versioned/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Flask plugin to rewrite file paths to add version info";
     homepage = "https://github.com/pilt/flask-versioned";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix
index 154c9f97ecc41..5088c3bcd605c 100644
--- a/pkgs/development/python-modules/flexmock/default.nix
+++ b/pkgs/development/python-modules/flexmock/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Testing library that makes it easy to create mocks,stubs and fakes";
     homepage = "https://flexmock.readthedocs.org";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix
index b514947d8e3bf..c527d036200b7 100644
--- a/pkgs/development/python-modules/flufl/bounce.nix
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     description = "Email bounce detectors";
     homepage = "https://gitlab.com/warsaw/flufl.bounce";
     changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix
index a592c4a4ddb0b..3a7295e0a0877 100644
--- a/pkgs/development/python-modules/flufl/i18n.nix
+++ b/pkgs/development/python-modules/flufl/i18n.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/warsaw/flufl.i18n";
     changelog = "https://gitlab.com/warsaw/flufl.i18n/-/raw/${version}/docs/NEWS.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix
index 5db308aa20cd5..246c97aa9c015 100644
--- a/pkgs/development/python-modules/foolscap/default.nix
+++ b/pkgs/development/python-modules/foolscap/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/warner/foolscap";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix
index 58a2fe4d772e5..216e48dd1ff2c 100644
--- a/pkgs/development/python-modules/formencode/default.nix
+++ b/pkgs/development/python-modules/formencode/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "FormEncode validates and converts nested structures";
     homepage = "http://formencode.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix
index 5913bb656e8a1..5372eb0b6d0c7 100644
--- a/pkgs/development/python-modules/fs-s3fs/default.nix
+++ b/pkgs/development/python-modules/fs-s3fs/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.org/project/fs-s3fs/";
     license = licenses.mit;
     description = "Amazon S3 filesystem for PyFilesystem2";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix
index 735d0b115cd64..e423f32d799e7 100644
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@@ -132,6 +132,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fsspec/filesystem_spec";
     changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index 0a3329b02c50b..01ec0e9d616af 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "High-level FTP client library (virtual file system and more)";
     homepage = "https://ftputil.sschwarzer.net/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix
index 4c3c342f32d60..33446197f52d3 100644
--- a/pkgs/development/python-modules/func-timeout/default.nix
+++ b/pkgs/development/python-modules/func-timeout/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads";
     homepage = "https://github.com/kata198/func_timeout";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index 63fcb2052237a..bafdd58d56ce5 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
     homepage = "https://github.com/aliles/funcsigs";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix
index a6bb66a173569..45359c9adc181 100644
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     homepage = "https://funcy.readthedocs.org/";
     changelog = "https://github.com/Suor/funcy/blob/2.0/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix
index 29809ebdfa5f5..4aca7ba229d43 100644
--- a/pkgs/development/python-modules/fx2/default.nix
+++ b/pkgs/development/python-modules/fx2/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     mainProgram = "fx2tool";
     homepage = "https://github.com/whitequark/libfx2";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix
index 6437deacd4904..5a928d5c79914 100644
--- a/pkgs/development/python-modules/gatt/default.nix
+++ b/pkgs/development/python-modules/gatt/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     mainProgram = "gattctl";
     homepage = "https://github.com/getsenic/gatt-python/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix
index b1b7d034ff591..057898dded4e0 100644
--- a/pkgs/development/python-modules/gemfileparser/default.nix
+++ b/pkgs/development/python-modules/gemfileparser/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
       gpl3Plus
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "parsegemfile";
   };
 }
diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix
index 14433fe94f3f9..4d91f5fb8a2e9 100644
--- a/pkgs/development/python-modules/geographiclib/default.nix
+++ b/pkgs/development/python-modules/geographiclib/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     homepage = "https://geographiclib.sourceforge.io";
     description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix
index 179ed9888c74b..b4a4583275878 100644
--- a/pkgs/development/python-modules/geoip2/default.nix
+++ b/pkgs/development/python-modules/geoip2/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/maxmind/GeoIP2-python";
     changelog = "https://github.com/maxmind/GeoIP2-python/blob/v${version}/HISTORY.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix
index 29f1714039f55..66afd40e9ecbe 100644
--- a/pkgs/development/python-modules/gevent-socketio/default.nix
+++ b/pkgs/development/python-modules/gevent-socketio/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "SocketIO server based on the Gevent pywsgi server";
     homepage = "https://github.com/abourget/gevent-socketio";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix
index 9fad31860ef11..a93c3dc6b925f 100644
--- a/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/pkgs/development/python-modules/gevent-websocket/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Websocket handler for the gevent pywsgi server";
     homepage = "https://www.gitlab.com/noppo/gevent-websocket";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix
index 7a0529cc89af3..aed16c67ce017 100644
--- a/pkgs/development/python-modules/gipc/default.nix
+++ b/pkgs/development/python-modules/gipc/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "http://gehrcke.de/gipc";
     changelog = "https://github.com/jgehrcke/gipc/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix
index 422b7b52c3c56..6de58d1edd01a 100644
--- a/pkgs/development/python-modules/gitdb/default.nix
+++ b/pkgs/development/python-modules/gitdb/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gitpython-developers/gitdb";
     changelog = "https://github.com/gitpython-developers/gitdb/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/glad/default.nix b/pkgs/development/python-modules/glad/default.nix
index 56eeb3f9047e7..8c9b40345a73d 100644
--- a/pkgs/development/python-modules/glad/default.nix
+++ b/pkgs/development/python-modules/glad/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     mainProgram = "glad";
     homepage = "https://github.com/Dav1dde/glad";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix
index 4ad9fa3060900..a62e403fc2603 100644
--- a/pkgs/development/python-modules/glcontext/default.nix
+++ b/pkgs/development/python-modules/glcontext/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "OpenGL implementation for ModernGL";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix
index bf22e5bce9196..8196b35ce3637 100644
--- a/pkgs/development/python-modules/glean-parser/default.nix
+++ b/pkgs/development/python-modules/glean-parser/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mozilla/glean_parser";
     changelog = "https://github.com/mozilla/glean_parser/blob/v${version}/CHANGELOG.md";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index cbff06c5d889f..ccfeaa3debacb 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -85,6 +85,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-api-core";
     changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index c31e4c81359f3..3cb93fc574194 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/google/google-api-python-client";
     changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix
index cfa2a0ba47a6f..ef1ad2a2fa901 100644
--- a/pkgs/development/python-modules/google-auth-httplib2/default.nix
+++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2";
     changelog = "https://github.com/googleapis/google-auth-library-python-httplib2/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index d086f02de5c00..5556429082f11 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -103,6 +103,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-auth-library-python";
     changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 7126dc489c071..350faaddb76d4 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v${version}/packages/google-cloud-asset/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix
index 93907bcf7eafd..113e8a0c3dda9 100644
--- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix
+++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-audit-log";
     changelog = "https://github.com/googleapis/python-audit-log/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index 7b05f46dbd341..43c6da42b468b 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-automl";
     changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-automl-v${version}/packages/google-cloud-automl";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 9e643cded4a35..7830d012c7c72 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-datatransfer";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v${version}/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
index 2326fb680467e..807c9c8acb91b 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-bigquery-storage";
     changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 7062b2b2e3d84..d9ea0eba51ba7 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -132,6 +132,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-bigquery";
     changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 30c5087f0d4a2..116e83effc962 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-bigtable";
     changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 884a337e56dfb..16794b8df65ba 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v${version}/packages/google-cloud-container/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix
index 3213156bb49ac..bd5fbf7ee044b 100644
--- a/pkgs/development/python-modules/google-cloud-core/default.nix
+++ b/pkgs/development/python-modules/google-cloud-core/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-cloud-core";
     changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 56f6363de14dd..2aab9d33f9487 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v${version}/packages/google-cloud-datacatalog/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 05040c6ae1c96..456411f13f9a6 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataproc";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dataproc-v${version}/packages/google-cloud-dataproc/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index fbce5713a507f..44f38f1e9ba4e 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -70,6 +70,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-datastore";
     changelog = "https://github.com/googleapis/python-datastore/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 42f7a3e0b28bb..6a7ddacb06494 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dlp";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dlp-v${version}/packages/google-cloud-dlp/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix
index 0ab6d3f677e9f..12da5d31a7cf3 100644
--- a/pkgs/development/python-modules/google-cloud-dns/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dns/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-dns";
     changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 5c60a79bd6133..56e898a15bfd1 100644
--- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-error-reporting";
     changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index db55f1afd4091..ce88d28953628 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-firestore";
     changelog = "https://github.com/googleapis/python-firestore/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index 7fe73ddf3c916..4cd4dc257fda9 100644
--- a/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-iot";
     changelog = "https://github.com/googleapis/python-iot/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 5a9c25bfc20ff..ff28fe3dfcb68 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v${version}/packages/google-cloud-kms/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 1fe089ce8db7f..04f88778036e4 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v${version}/packages/google-cloud-language/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index 95b237af99848..9fbd08a30863a 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -86,6 +86,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-logging";
     changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index 437034e40120a..5b6c969a9ce39 100644
--- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-monitoring";
     changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-monitoring-v${version}/packages/google-cloud-monitoring";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix
index 4dee8f473d67b..66b341273fd2c 100644
--- a/pkgs/development/python-modules/google-cloud-netapp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 2612fb157fae7..e4c45f2e3fb4a 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-os-config";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-os-config-v${version}/packages/google-cloud-os-config/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 4f4877e3589a8..5f7618c3af515 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-pubsub";
     changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index 851697c0dffd2..83a14eb68c4f8 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-redis";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-redis-v${version}/packages/google-cloud-redis/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index add940196fa82..6cb795d073f36 100644
--- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
index 82cd2b45ecbbf..7f6cc83c1c974 100644
--- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-runtimeconfig";
     changelog = "https://github.com/googleapis/python-runtimeconfig/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 772cef5957af2..1a45f67cb5df0 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-securitycenter";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v${version}/packages/google-cloud-securitycenter/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 671c5fc37e2ad..2da0cc9811866 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -86,6 +86,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-spanner";
     changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index f8c1684c4e9cd..fd1d084cd14f4 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-speech";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-speech-v${version}/packages/google-cloud-speech/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 3d47efcfcfbb6..4a5081468f9c5 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -94,6 +94,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-storage";
     changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 7b7c3660f02cd..144f568cd484c 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-tasks";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-tasks-v${version}/packages/google-cloud-tasks/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix
index 15d8d226d50bd..e62d47e372496 100644
--- a/pkgs/development/python-modules/google-cloud-testutils/default.nix
+++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-test-utils";
     changelog = "https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index c5830b8d93049..80b22fb2ecd92 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-texttospeech";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-texttospeech-v${version}/packages/google-cloud-texttospeech/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index 3d6c8b78b4049..caf839ce54c2a 100644
--- a/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-trace";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-trace-v${version}/packages/google-cloud-trace/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index e25cf74a493e4..f3cbe6abc8551 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-translate";
     changelog = "https://github.com/googleapis/python-translate/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index c11cc40af3f89..bf5358dce44cc 100644
--- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-videointelligence";
     changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-videointelligence-v${version}/packages/google-cloud-videointelligence/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index 2ee06820909d6..75cc08070a317 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-vision";
     changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 7a962443f38c8..5c55dd74169b5 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-websecurityscanner";
     changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-websecurityscanner-v${version}/packages/google-cloud-websecurityscanner";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix
index 47355a45ffdf2..d13183bacf354 100644
--- a/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/pkgs/development/python-modules/google-i18n-address/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mirumee/google-i18n-address";
     changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix
index f5975586735c6..504987669e7e3 100644
--- a/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python";
     changelog = "https://github.com/googleapis/google-resumable-media-python/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix
index 9e62755a0e111..eb4d8e5944aeb 100644
--- a/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Common protobufs used in Google APIs";
     homepage = "https://github.com/googleapis/python-api-common-protos";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
index da55f64055d59..cd6ce736d2a62 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/NoMore201/googleplay-api";
     license = licenses.gpl3Only;
     description = "Google Play Unofficial Python API";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index a7535c813b6ff..7f1e5ce0e4764 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Python interface to libgphoto2";
     homepage = "https://github.com/jim-easterbrook/python-gphoto2";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
index cf427d0560c29..9303ef9d1450e 100644
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ b/pkgs/development/python-modules/gplaycli/default.nix
@@ -70,6 +70,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/matlink/gplaycli";
     changelog = "https://github.com/matlink/gplaycli/releases/tag/${version}";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix
index e2908da74f70a..6d12f2629793d 100644
--- a/pkgs/development/python-modules/gpt-2-simple/default.nix
+++ b/pkgs/development/python-modules/gpt-2-simple/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Easily retrain OpenAI's GPT-2 text-generating model on new texts";
     homepage = "https://github.com/minimaxir/gpt-2-simple";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index bea97bea98f7b..db44239de0b57 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/graphql-python/graphene";
     changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix
index 75b0471211765..a358ab4fe9141 100644
--- a/pkgs/development/python-modules/graphql-relay/default.nix
+++ b/pkgs/development/python-modules/graphql-relay/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "Library to help construct a graphql-py server supporting react-relay";
     homepage = "https://github.com/graphql-python/graphql-relay-py/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix
index 147cd19164e2a..9383ec903700c 100644
--- a/pkgs/development/python-modules/greatfet/default.nix
+++ b/pkgs/development/python-modules/greatfet/default.nix
@@ -1,46 +1,69 @@
 {
-  lib,
-  fetchFromGitHub,
   buildPythonPackage,
-  isPy3k,
+  cmsis-svd,
+  fetchFromGitHub,
   future,
-  pyusb,
   ipython,
+  lib,
+  prompt-toolkit,
+  pyfwup,
   pygreat,
+  pythonOlder,
+  pyusb,
+  setuptools,
+  tabulate,
+  tqdm,
 }:
 
 buildPythonPackage rec {
   pname = "greatfet";
   version = "2024.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "greatscottgadgets";
     repo = "greatfet";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ=";
+    hash = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ=";
   };
 
-  disabled = !isPy3k;
+  sourceRoot = "${src.name}/host";
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cmsis-svd
     future
-    pyusb
     ipython
+    prompt-toolkit
+    pyfwup
     pygreat
+    pyusb
+    tabulate
+    tqdm
   ];
 
+  # Tests seem to require devices (or simulators) which are
+  # not available in the build sandbox.
   doCheck = false;
 
-  preBuild = ''
-    cd host
-    echo "$version" > ../VERSION
-  '';
-
   meta = {
     description = "Hardware hacking with the greatfet";
     homepage = "https://greatscottgadgets.com/greatfet";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ mog ];
+    mainProgram = "gf";
+    maintainers = with lib.maintainers; [
+      mog
+      msanft
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix
index 4d632b21ca5c7..054d632064a19 100644
--- a/pkgs/development/python-modules/green/default.nix
+++ b/pkgs/development/python-modules/green/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Python test runner";
     homepage = "https://github.com/CleanCut/green";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
index 111678f0b98f2..17ede6dee378a 100644
--- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
+++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googleapis/python-grpc-google-iam-v1";
     changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index fa204c048982c..7d859b3af7cd5 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Protobuf code generator for gRPC";
     license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index dca383e92a6bd..44c591d783a28 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -78,6 +78,6 @@ buildPythonPackage rec {
     description = "HTTP/2-based RPC framework";
     license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index 48b8694650b4d..e280a1de734b5 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/glotzerlab/gsd";
     changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index d07e08d3eba96..efcc03f3bc2bd 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/burnash/gspread";
     changelog = "https://github.com/burnash/gspread/blob/v${version}/HISTORY.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index ccb4c30f24d4a..27d4d0f869641 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     homepage = "https://gstreamer.freedesktop.org";
     description = "Python bindings for GStreamer";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index ec73362550396..c86ecb59ef33e 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://guessit-io.github.io/guessit/";
     changelog = "https://github.com/guessit-io/guessit/raw/v${version}/CHANGELOG.md";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix
index a385f55ca8999..a7e4271006d77 100644
--- a/pkgs/development/python-modules/h11/default.nix
+++ b/pkgs/development/python-modules/h11/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
     homepage = "https://github.com/python-hyper/h11";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix
index 7e216c2c8f62b..3666c7db9e648 100644
--- a/pkgs/development/python-modules/h2/default.nix
+++ b/pkgs/development/python-modules/h2/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     description = "HTTP/2 State-Machine based protocol implementation";
     homepage = "https://github.com/python-hyper/h2";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix
index f5128692ce563..cc43f6d6dff2d 100644
--- a/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/pkgs/development/python-modules/h5netcdf/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/shoyer/h5netcdf";
     changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix
index 613b6a8315861..c08ffcd12132f 100644
--- a/pkgs/development/python-modules/habanero/default.nix
+++ b/pkgs/development/python-modules/habanero/default.nix
@@ -5,18 +5,14 @@
   setuptools-scm,
   requests,
   tqdm,
-  nose,
   vcrpy,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "habanero";
   version = "1.2.6";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sckott";
@@ -25,9 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     tqdm
   ];
@@ -42,10 +38,10 @@ buildPythonPackage rec {
   # almost the entirety of the test suite makes network calls
   pytestFlagsArray = [ "test/test-filters.py" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python interface to Library Genesis";
     homepage = "https://habanero.readthedocs.io/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nico202 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nico202 ];
   };
 }
diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
index 731aeeba52ced..7a070285d382a 100644
--- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
+++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     mainProgram = "hatch-jupyter-builder";
     homepage = "https://github.com/jupyterlab/hatch-jupyter-builder";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix
index 12e304475c74c..3d4c69fec005e 100644
--- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix
+++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Hatchling plugin to read project dependencies from requirements.txt";
     homepage = "https://github.com/repo-helper/hatch-requirements-txt";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix
index b7c6c73820a25..ae7933207c3c9 100644
--- a/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mozilla-services/hawkauthlib";
     description = "Hawk Access Authentication protocol";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix
index 311644b15ce00..5d0845c9725b8 100644
--- a/pkgs/development/python-modules/hexbytes/default.nix
+++ b/pkgs/development/python-modules/hexbytes/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ethereum/hexbytes";
     changelog = "https://github.com/ethereum/hexbytes/blob/v${version}/docs/release_notes.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index 78633fe9ef6ff..eb17dd0534001 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     mainProgram = "holoviews";
     homepage = "https://www.holoviews.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index dc614456f8926..53995d2de5d70 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     description = "Instant coding answers via the command line";
     homepage = "https://github.com/gleitz/howdoi";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix
index a6042315c3779..df23b4ec3c8ee 100644
--- a/pkgs/development/python-modules/hpack/default.nix
+++ b/pkgs/development/python-modules/hpack/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Pure-Python HPACK header compression";
     homepage = "https://github.com/python-hyper/hpack";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index e0943982dc7e6..5ef5504c84b75 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Chromium HSTS Preload list as a Python package and updated daily";
     homepage = "https://github.com/sethmlarson/hstspreload";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/html-table-parser-python3/default.nix b/pkgs/development/python-modules/html-table-parser-python3/default.nix
new file mode 100644
index 0000000000000..c4f3f8fc46aaf
--- /dev/null
+++ b/pkgs/development/python-modules/html-table-parser-python3/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "html-table-parser-python3";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "schmijos";
+    repo = "html-table-parser-python3";
+    rev = "v${version}";
+    hash = "sha256-okYl0T12wVld7GVbFQH2hgEVKXSScipJN/vYaiRVdGY=";
+  };
+
+  build-system = [ poetry-core ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "html_table_parser" ];
+
+  meta = {
+    description = "Small and simple HTML table parser not requiring any external dependency.";
+    homepage = "https://github.com/schmijos/html-table-parser-python3";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix
index 236b312e343da..b114029aadacb 100644
--- a/pkgs/development/python-modules/html2text/default.nix
+++ b/pkgs/development/python-modules/html2text/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/Alir3z4/html2text/";
     changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "html2text";
   };
 }
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index 6658642d4a0ef..2a3e0dfb42c3d 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Fast C based HTML 5 parsing for python";
     homepage = "https://html5-parser.readthedocs.io";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix
index cf3b6ac8bf936..527e3660481b1 100644
--- a/pkgs/development/python-modules/html5tagger/default.nix
+++ b/pkgs/development/python-modules/html5tagger/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Create HTML documents from Python";
     homepage = "https://github.com/sanic-org/html5tagger";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix
index f2f6b2110688d..5bd467bed3851 100644
--- a/pkgs/development/python-modules/htmllistparse/default.nix
+++ b/pkgs/development/python-modules/htmllistparse/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Python parser for Apache/nginx-style HTML directory listing";
     mainProgram = "rehttpfs";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix
index 2fb598918a14a..80362a801d36b 100644
--- a/pkgs/development/python-modules/httpauth/default.nix
+++ b/pkgs/development/python-modules/httpauth/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     description = "WSGI HTTP Digest Authentication middleware";
     homepage = "https://github.com/jonashaag/httpauth";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
index a4e867d981716..4b670b4c17bde 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -75,6 +75,6 @@ buildPythonPackage rec {
     description = "HTTP Request and Response Service";
     homepage = "https://github.com/psf/httpbin";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix
index cc91c40429926..c6d2c176a5f6d 100644
--- a/pkgs/development/python-modules/httptools/default.nix
+++ b/pkgs/development/python-modules/httptools/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/MagicStack/httptools";
     changelog = "https://github.com/MagicStack/httptools/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index 0f46eef1eee35..a7a6525e942da 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "hupper";
     homepage = "https://github.com/Pylons/hupper";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index 74002cade8430..67429f81efe0d 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ianunruh/hvac";
     changelog = "https://github.com/hvac/hvac/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index 675e82cf2e57c..7884f61cbcb6e 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://hvplot.pyviz.org";
     changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix
index 5842ced668fc1..e82b3b21c8b62 100644
--- a/pkgs/development/python-modules/hyperframe/default.nix
+++ b/pkgs/development/python-modules/hyperframe/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "HTTP/2 framing layer for Python";
     homepage = "https://github.com/python-hyper/hyperframe/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix
index 6067efde3ed3b..eca2ca1014572 100644
--- a/pkgs/development/python-modules/hypothesis-auto/default.nix
+++ b/pkgs/development/python-modules/hypothesis-auto/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Enables fully automatic tests for type annotated functions";
     homepage = "https://github.com/timothycrosley/hypothesis-auto/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index a76b8e2ff29d3..9590857b3480d 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -120,6 +120,6 @@ buildPythonPackage rec {
       lib.replaceStrings [ "." ] [ "-" ] version
     }";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index be40b4375e41b..a69c0c08214e4 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Zac-HD/hypothesmith";
     changelog = "https://github.com/Zac-HD/hypothesmith/blob/master/CHANGELOG.md";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix
index 84eedf9e3b69d..2300af2347841 100644
--- a/pkgs/development/python-modules/ibis/default.nix
+++ b/pkgs/development/python-modules/ibis/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Lightweight template engine";
     homepage = "https://github.com/dmulholland/ibis";
     license = licenses.publicDomain;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix
index 2f973a6dc9812..b1d4dd9a1f052 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/pkgs/development/python-modules/ics/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     homepage = "http://icspy.readthedocs.org/";
     changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix
index 7a16b64e86f36..c23fc8ad870f1 100644
--- a/pkgs/development/python-modules/ijson/default.nix
+++ b/pkgs/development/python-modules/ijson/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ICRAR/ijson";
     changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix
index 04368c8e752cf..35a1e8a426f3f 100644
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "imap-tools";
-  version = "1.7.0";
+  version = "1.7.1";
 
   disabled = pythonOlder "3.5";
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "ikvk";
     repo = "imap_tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ULtDJkNSrWM0/pDblTeE7lKS/4UNYM06hWrEw51ZbVA=";
+    hash = "sha256-G2CO5WgMvpPeq/EM9eFW36xYoMD+7nUm8FsMWfCoLf4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index 9077ddae4b4b1..db600c27aa1af 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -40,7 +40,7 @@ let
       homepage = "https://github.com/twisted/incremental";
       description = "Incremental is a small library that versions your Python projects";
       license = licenses.mit;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix
index ada4397a03d49..9db5dcf0af655 100644
--- a/pkgs/development/python-modules/iniconfig/default.nix
+++ b/pkgs/development/python-modules/iniconfig/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "brain-dead simple parsing of ini files";
     homepage = "https://github.com/pytest-dev/iniconfig";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix
index b3ade47dcaf7b..a03e4070326f4 100644
--- a/pkgs/development/python-modules/inifile/default.nix
+++ b/pkgs/development/python-modules/inifile/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "Small INI library for Python";
     homepage = "https://github.com/mitsuhiko/python-inifile";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/inlinestyler/default.nix b/pkgs/development/python-modules/inlinestyler/default.nix
index 3228d0f5b4554..2fd63571eb286 100644
--- a/pkgs/development/python-modules/inlinestyler/default.nix
+++ b/pkgs/development/python-modules/inlinestyler/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dlanger/inlinestyler";
     changelog = "https://github.com/dlanger/inlinestyler/blob/${src.rev}/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix
index 5de7c6e10b1ce..b98b7fdfa07b4 100644
--- a/pkgs/development/python-modules/inscriptis/default.nix
+++ b/pkgs/development/python-modules/inscriptis/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/weblyzard/inscriptis";
     changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index 0951b6218b0b0..80907730ffcf4 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -137,6 +137,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ContinuumIO/intake";
     changelog = "https://github.com/intake/intake/blob/${version}/docs/source/changelog.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index 5ac98f31c5534..019ebd243f2cd 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Pythonic task execution";
     homepage = "https://www.pyinvoke.org/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix
index 0d91a2cc765e9..26d3939d1772a 100644
--- a/pkgs/development/python-modules/iocsearcher/default.nix
+++ b/pkgs/development/python-modules/iocsearcher/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "iocsearcher";
-  version = "2.3-unstable-2024-03-04";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix
index 5c296986b58d4..a9942a37580f0 100644
--- a/pkgs/development/python-modules/ionoscloud/default.nix
+++ b/pkgs/development/python-modules/ionoscloud/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Python API client for ionoscloud";
     changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
index 7d6fa662f0c8a..c7408868ad916 100644
--- a/pkgs/development/python-modules/irc/default.nix
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jaraco/irc";
     changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix
index 520b7f615978b..8bf7e67b9ecd2 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/pkgs/development/python-modules/isbnlib/default.nix
@@ -1,31 +1,55 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  nose,
-  coverage,
-  pythonOlder,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pytest-cov,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "isbnlib";
   version = "3.10.14";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-lvkIZMd7AfVfoR5b/Kn9kJUB2YQvO8cQ1Oq4UZXZBTk=";
+  src = fetchFromGitHub {
+    owner = "xlcnd";
+    repo = "isbnlib";
+    rev = "v${version}";
+    hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
-    nose
-    coverage
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pytestFlagsArray = [ "isbnlib/test/" ];
+
+  # All disabled tests require a network connection
+  disabledTests = [
+    "test_cache"
+    "test_editions_any"
+    "test_editions_merge"
+    "test_editions_thingl"
+    "test_editions_wiki"
+    "test_isbn_from_words"
+    "test_desc"
+    "test_cover"
   ];
 
-  # requires network connection
-  doCheck = false;
+  disabledTestPaths = [
+    "isbnlib/test/test_cache_decorator.py"
+    "isbnlib/test/test_goom.py"
+    "isbnlib/test/test_metadata.py"
+    "isbnlib/test/test_openl.py"
+    "isbnlib/test/test_rename.py"
+    "isbnlib/test/test_webservice.py"
+    "isbnlib/test/test_wiki.py"
+    "isbnlib/test/test_words.py"
+  ];
 
   pythonImportsCheck = [
     "isbnlib"
diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix
index b72476e7743bf..79de8ce0df387 100644
--- a/pkgs/development/python-modules/isosurfaces/default.nix
+++ b/pkgs/development/python-modules/isosurfaces/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
       many far from the implicit surface.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/isounidecode/default.nix b/pkgs/development/python-modules/isounidecode/default.nix
index 9ac5d454b2fc5..c8b0607b0244b 100644
--- a/pkgs/development/python-modules/isounidecode/default.nix
+++ b/pkgs/development/python-modules/isounidecode/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Python package for conversion and transliteration of unicode into ascii or iso-8859-1";
     homepage = "https://github.com/redvasily/isounidecode";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix
index ac9250637a3ae..b501fa5927c4c 100644
--- a/pkgs/development/python-modules/itemadapter/default.nix
+++ b/pkgs/development/python-modules/itemadapter/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/scrapy/itemadapter";
     changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix
index ac904ef15253e..bd6e8b884ac10 100644
--- a/pkgs/development/python-modules/itemloaders/default.nix
+++ b/pkgs/development/python-modules/itemloaders/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/scrapy/itemloaders";
     changelog = "https://github.com/scrapy/itemloaders/raw/v${version}/docs/release-notes.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix
index 5dc9382baad19..ae4db9f10b3ec 100644
--- a/pkgs/development/python-modules/iteration-utilities/default.nix
+++ b/pkgs/development/python-modules/iteration-utilities/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/MSeifert04/iteration_utilities";
     changelog = "https://github.com/MSeifert04/iteration_utilities/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix
index 771f91a461acf..a1e83de89c125 100644
--- a/pkgs/development/python-modules/itypes/default.nix
+++ b/pkgs/development/python-modules/itypes/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Simple immutable types for python";
     homepage = "https://github.com/tomchristie/itypes";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix
index 61755ada57e0f..c976fca5d6344 100644
--- a/pkgs/development/python-modules/jaeger-client/default.nix
+++ b/pkgs/development/python-modules/jaeger-client/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     downloadPage = "https://pypi.org/project/jaeger-client/";
     homepage = "https://github.com/jaegertracing/jaeger-client-python";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix
index 9992250b4cc9f..5b08f94e984d1 100644
--- a/pkgs/development/python-modules/jaraco-collections/default.nix
+++ b/pkgs/development/python-modules/jaraco-collections/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jaraco/jaraco.collections";
     changelog = "https://github.com/jaraco/jaraco.collections/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix
index 722d707a18aea..4af7e125b83d6 100644
--- a/pkgs/development/python-modules/jaraco-functools/default.nix
+++ b/pkgs/development/python-modules/jaraco-functools/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Additional functools in the spirit of stdlib's functools";
     homepage = "https://github.com/jaraco/jaraco.functools";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix
index aeb99584cce78..3368ac4ae19e6 100644
--- a/pkgs/development/python-modules/jaraco-logging/default.nix
+++ b/pkgs/development/python-modules/jaraco-logging/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jaraco/jaraco.logging";
     changelog = "https://github.com/jaraco/jaraco.logging/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix
index a3656f5cfbc2c..5ff8b117eb80d 100644
--- a/pkgs/development/python-modules/jaraco-text/default.nix
+++ b/pkgs/development/python-modules/jaraco-text/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Module for text manipulation";
     homepage = "https://github.com/jaraco/jaraco.text";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix
index 2c26ec97aea4a..bd8c9085a25d8 100644
--- a/pkgs/development/python-modules/javaproperties/default.nix
+++ b/pkgs/development/python-modules/javaproperties/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure API Management Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix
index fa774a40b7e84..553500c47be67 100644
--- a/pkgs/development/python-modules/jdatetime/default.nix
+++ b/pkgs/development/python-modules/jdatetime/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Jalali datetime binding";
     homepage = "https://github.com/slashmili/python-jalali";
     license = licenses.psfl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index 26bd4a173dcb3..a47398cb9ca3e 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/davidhalter/jedi";
     changelog = "https://github.com/davidhalter/jedi/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index a74c54dc4149e..6e4cb647e8651 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     mainProgram = "jenkins-jobs";
     homepage = "https://jenkins-job-builder.readthedocs.io/en/latest/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix
index 2f0dcad69c3f2..3e007d326d888 100644
--- a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix
+++ b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Jinja2 Ansible Filters";
     homepage = "https://pypi.org/project/jinja2-ansible-filters/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jinja2-time/default.nix b/pkgs/development/python-modules/jinja2-time/default.nix
index 5a2a020af9c37..b0783c69f4ba5 100644
--- a/pkgs/development/python-modules/jinja2-time/default.nix
+++ b/pkgs/development/python-modules/jinja2-time/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/hackebrot/jinja2-time";
     description = "Jinja2 Extension for Dates and Times";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index 5e0a57983b5fb..2e2ff91c8b0a3 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -85,7 +85,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/pycontribs/jira";
     changelog = "https://github.com/pycontribs/jira/releases/tag/${version}";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "jirashell";
   };
 }
diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix
index f6a15f0156f6a..a01dc0b7984d3 100644
--- a/pkgs/development/python-modules/jmespath/default.nix
+++ b/pkgs/development/python-modules/jmespath/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document";
     mainProgram = "jp.py";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index f56aa7a39197a..65b728b34e9ae 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     description = "Lightweight pipelining: using Python functions as pipeline jobs";
     homepage = "https://joblib.readthedocs.io/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix
index a48098db4a48a..a54844be9213d 100644
--- a/pkgs/development/python-modules/joserfc/default.nix
+++ b/pkgs/development/python-modules/joserfc/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Implementations of JOSE RFCs in Python";
     homepage = "https://github.com/authlib/joserfc";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix
index 998b841e379a3..773327b85cfbd 100644
--- a/pkgs/development/python-modules/jschema-to-python/default.nix
+++ b/pkgs/development/python-modules/jschema-to-python/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Generate source code for Python classes from a JSON schema";
     homepage = "https://github.com/microsoft/jschema-to-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix
index 44b508af55c8b..3a15b321e5cd2 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/pkgs/development/python-modules/jsmin/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "JavaScript minifier";
     homepage = "https://github.com/tikitu/jsmin/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonable/default.nix b/pkgs/development/python-modules/jsonable/default.nix
index 4dd7c96221e6f..705ff95a2d770 100644
--- a/pkgs/development/python-modules/jsonable/default.nix
+++ b/pkgs/development/python-modules/jsonable/default.nix
@@ -2,14 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  nose,
   pytestCheckHook,
+  fetchpatch2,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "jsonable";
   version = "0.3.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "halfak";
@@ -18,17 +19,25 @@ buildPythonPackage rec {
     hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA=";
   };
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
+  patches = [
+    # https://github.com/halfak/python-jsonable/pull/2
+    (fetchpatch2 {
+      name = "eq-to-assert.patch";
+      url = "https://github.com/halfak/python-jsonable/pull/2/commits/335e61bb4926e644aef983f7313793bf506d2463.patch";
+      hash = "sha256-tCVA0wG+UMyB6oaNf4nbZ2BPWkNumaGPcjP5VJKegBo=";
+    })
   ];
 
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
   pythonImportsCheck = [ "jsonable" ];
 
-  meta = with lib; {
+  meta = {
     description = "Provides an abstract base class and utilities for defining trivially JSONable python objects";
     homepage = "https://github.com/halfak/python-jsonable";
-    license = licenses.mit;
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix
index 1e8a94e8e1c7c..fbe7007b248f1 100644
--- a/pkgs/development/python-modules/jsonlines/default.nix
+++ b/pkgs/development/python-modules/jsonlines/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Python library to simplify working with jsonlines and ndjson data";
     homepage = "https://github.com/wbolster/jsonlines";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix
index 5879be3b53592..208d4dd78fbcb 100644
--- a/pkgs/development/python-modules/jsonmerge/default.nix
+++ b/pkgs/development/python-modules/jsonmerge/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/avian2/jsonmerge";
     changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix
index 09c61d708944e..42712f4e54e90 100644
--- a/pkgs/development/python-modules/jsonpatch/default.nix
+++ b/pkgs/development/python-modules/jsonpatch/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Library to apply JSON Patches according to RFC 6902";
     homepage = "https://github.com/stefankoegl/python-json-patch";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index 9c5ce75a89b70..fbae39f1b548d 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gazpachoking/jsonref";
     changelog = "https://github.com/gazpachoking/jsonref/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 5cf7fe1f5b803..314e3433dadf2 100644
--- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     description = "JSON RPC client library - Pelix compatible fork";
     homepage = "https://pypi.python.org/pypi/jsonrpclib-pelix/";
     license = lib.licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix
index e0cc52123cfb5..727d5afa83cc7 100644
--- a/pkgs/development/python-modules/jupyter-book/default.nix
+++ b/pkgs/development/python-modules/jupyter-book/default.nix
@@ -70,7 +70,7 @@ buildPythonPackage rec {
     homepage = "https://jupyterbook.org/";
     changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "jupyter-book";
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix
index 1d57a7a5d8cfc..2815d9ee8105d 100644
--- a/pkgs/development/python-modules/jupyter-cache/default.nix
+++ b/pkgs/development/python-modules/jupyter-cache/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/jupyter-cache";
     changelog = "https://github.com/executablebooks/jupyter-cache/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix
index 0451a3fb74ef1..66de5a91ff5fd 100644
--- a/pkgs/development/python-modules/jupyter-events/default.nix
+++ b/pkgs/development/python-modules/jupyter-events/default.nix
@@ -73,6 +73,6 @@ buildPythonPackage rec {
     mainProgram = "jupyter-events";
     homepage = "https://github.com/jupyter/jupyter_events";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix
index 90ed978eba27b..54ce115af8dfc 100644
--- a/pkgs/development/python-modules/jupyter-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyter-lsp/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = "https://jupyterlab-lsp.readthedocs.io/en/latest/";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index 6341f29b85c13..059de94c6982e 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "https://repo2docker.readthedocs.io/";
     changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.rev}/docs/source/changelog.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
index 58e1763006fdc..a3937b5d8bdb1 100644
--- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "MathJax resources as a Jupyter Server Extension";
     homepage = "https://github.com/jupyter-server/jupyter_server_mathjax";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
index 91ca1fb69273a..1d216f7b88055 100644
--- a/pkgs/development/python-modules/jupyter-server-terminals/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix
@@ -51,7 +51,7 @@ let
       description = "Jupyter Server Extension Providing Support for Terminals";
       homepage = "https://github.com/jupyter-server/jupyter_server_terminals";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
index 56712d25f4f49..216beb5fc5fee 100644
--- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jupyterhub/systemdspawner";
     changelog = "https://github.com/jupyterhub/systemdspawner/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix
index 408a48c7faa68..4f39d7fdc536e 100644
--- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp";
     license = licenses.bsd3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix
index 53c03dbdacdd6..204516e39d5a0 100644
--- a/pkgs/development/python-modules/jupyterlab-pygments/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Jupyterlab syntax coloring theme for pygments";
     homepage = "https://github.com/jupyterlab/jupyterlab_pygments";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
index e57ec6de6798d..cd538beade251 100644
--- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Jupyter Widgets JupyterLab Extension";
     homepage = "https://github.com/jupyter-widgets/ipywidgets";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix
index 1a418d128dfe4..80e4159a03b74 100644
--- a/pkgs/development/python-modules/jwcrypto/default.nix
+++ b/pkgs/development/python-modules/jwcrypto/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/latchset/jwcrypto";
     changelog = "https://github.com/latchset/jwcrypto/releases/tag/v${version}";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix
index 480bddc93dede..3364b86686e74 100644
--- a/pkgs/development/python-modules/jxmlease/default.nix
+++ b/pkgs/development/python-modules/jxmlease/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Converts between XML and intelligent Python data structures";
     homepage = "https://github.com/Juniper/jxmlease";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix
index 982accf1459a3..676fea31f8276 100644
--- a/pkgs/development/python-modules/k5test/default.nix
+++ b/pkgs/development/python-modules/k5test/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pythongssapi/k5test";
     changelog = "https://github.com/pythongssapi/k5test/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix
index cacf76a6cb0de..ac4b1cf52f737 100644
--- a/pkgs/development/python-modules/kaa-base/default.nix
+++ b/pkgs/development/python-modules/kaa-base/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Generic application framework, providing the foundation for other modules";
     homepage = "https://github.com/freevo/kaa-base";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix
index 669060fa2ac43..bb8fe831c2b91 100644
--- a/pkgs/development/python-modules/kaa-metadata/default.nix
+++ b/pkgs/development/python-modules/kaa-metadata/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files";
     homepage = "https://github.com/freevo/kaa-metadata";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index 730c796c951b5..67e7febd7f177 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Pure Python client for Apache Kafka";
     homepage = "https://github.com/dpkp/kafka-python";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix
index f20a03e6df3ca..ec647cf649f7a 100644
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@@ -1,37 +1,49 @@
 {
-  buildPythonPackage,
   bleach,
+  buildPythonPackage,
   certifi,
+  charset-normalizer,
   fetchPypi,
+  hatchling,
+  idna,
   lib,
   python-dateutil,
   python-slugify,
-  six,
   requests,
+  setuptools,
+  six,
+  text-unidecode,
   tqdm,
   urllib3,
+  webencodings,
 }:
 
 buildPythonPackage rec {
   pname = "kaggle";
-  version = "1.6.14";
-  format = "setuptools";
+  version = "1.6.17";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k=";
+    hash = "sha256-Q5p96h1QOfMg/WrV7CG2iNz6cNQFy0IJW4H0HtxAG4E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ hatchling ];
+
+  dependencies = [
     bleach
     certifi
+    charset-normalizer
+    idna
     python-dateutil
     python-slugify
     requests
+    setuptools
     six
+    text-unidecode
     tqdm
     urllib3
-    bleach
+    webencodings
   ];
 
   # Tests try to access the network.
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
index caed3ddfcf7b1..14795b0c1268d 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage rec {
     description = "Python Kaldi speech recognition";
     homepage = "https://github.com/daanzu/kaldi-active-grammar";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # Other platforms are supported upstream.
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
index b5c785d2b12b4..00d2e2802f09d 100644
--- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
     description = "Speech Recognition Toolkit";
     homepage = "https://kaldi-asr.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix
index 248a09630f518..c27221611b86e 100644
--- a/pkgs/development/python-modules/kaptan/default.nix
+++ b/pkgs/development/python-modules/kaptan/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     mainProgram = "kaptan";
     homepage = "https://kaptan.readthedocs.io/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
index 8aba622aee15c..931017a198ff6 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fedora-infra/kitchen";
     changelog = "https://github.com/fedora-infra/kitchen/blob/${version}/NEWS.rst";
     license = licenses.lgpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index e68ff83c462ea..d71b613b58b8b 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Implementation of the Cassowary constraint solver";
     homepage = "https://github.com/nucleic/kiwi";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix
index 20d00b4c47fca..f61fe242dac16 100644
--- a/pkgs/development/python-modules/knack/default.nix
+++ b/pkgs/development/python-modules/knack/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst";
     platforms = platforms.all;
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index 962ba7d8375c7..bb071fc3f0aaa 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -3,8 +3,12 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   deprecation,
   poetry-core,
+
+  # dependencies
   async-timeout,
   cloudevents,
   fastapi,
@@ -17,12 +21,16 @@
   prometheus-client,
   protobuf,
   psutil,
+  pydantic,
   python-dateutil,
+  pyyaml,
   ray,
   six,
   tabulate,
   timing-asgi,
   uvicorn,
+
+  # checks
   avro,
   azure-storage-blob,
   azure-storage-file-share,
@@ -30,13 +38,14 @@
   botocore,
   google-cloud-storage,
   grpcio-testing,
+  pytest-asyncio,
   pytestCheckHook,
   tomlkit,
 }:
 
 buildPythonPackage rec {
   pname = "kserve";
-  version = "0.13.0";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -45,7 +54,7 @@ buildPythonPackage rec {
     owner = "kserve";
     repo = "kserve";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Fu+1AR7FU4EQ+PhMneHFr3at3N9cN7V24wm/VOfY8GA=";
+    hash = "sha256-wGS001PK+k21oCOaQCiAtytTDjfe0aiTVJ9spyOucYA=";
   };
 
   sourceRoot = "${src.name}/python/kserve";
@@ -68,7 +77,9 @@ buildPythonPackage rec {
     prometheus-client
     protobuf
     psutil
+    pydantic
     python-dateutil
+    pyyaml
     ray
     six
     tabulate
@@ -96,6 +107,7 @@ buildPythonPackage rec {
     botocore
     google-cloud-storage
     grpcio-testing
+    pytest-asyncio
     pytestCheckHook
     tomlkit
   ];
diff --git a/pkgs/development/python-modules/lazy-loader/default.nix b/pkgs/development/python-modules/lazy-loader/default.nix
index 974288e365f3f..ad51358ccb78d 100644
--- a/pkgs/development/python-modules/lazy-loader/default.nix
+++ b/pkgs/development/python-modules/lazy-loader/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/scientific-python/lazy_loader";
     changelog = "https://github.com/scientific-python/lazy_loader/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
index 7cf35cfe2c466..14534ef1d15ab 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://pypi.python.org/pypi/ldap3";
     description = "Strictly RFC 4510 conforming LDAP V3 pure Python client library";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ldapdomaindump/default.nix b/pkgs/development/python-modules/ldapdomaindump/default.nix
index 8b7ba429025ca..e154108d063c5 100644
--- a/pkgs/development/python-modules/ldapdomaindump/default.nix
+++ b/pkgs/development/python-modules/ldapdomaindump/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dirkjanm/ldapdomaindump/";
     changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index 1b9c9f6ec8a20..e1aed9fe9be74 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Pure-Python Twisted library for LDAP";
     homepage = "https://github.com/twisted/ldaptor";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix
index 3af76888e420b..6cac7476142f0 100644
--- a/pkgs/development/python-modules/leather/default.nix
+++ b/pkgs/development/python-modules/leather/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Python charting library";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix
index 5422e877bacfb..b68c21f7c7cfb 100644
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/pkgs/development/python-modules/libais/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/schwehr/libais";
     changelog = "https://github.com/schwehr/libais/blob/master/Changelog.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix
index fb66d88b942bb..b60c3992faf28 100644
--- a/pkgs/development/python-modules/libclang/default.nix
+++ b/pkgs/development/python-modules/libclang/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage {
 
   meta = libclang.meta // {
     description = "Python bindings for the C language family frontend for LLVM";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix
index 8c3481cdecffb..8fe46bd9572a7 100644
--- a/pkgs/development/python-modules/libcloud/default.nix
+++ b/pkgs/development/python-modules/libcloud/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://libcloud.apache.org/";
     changelog = "https://github.com/apache/libcloud/blob/v${version}/CHANGES.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index 140c919d70810..ab176fd8252f1 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -95,6 +95,6 @@ buildPythonPackage rec {
       asl20
       psfl
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix
index 40650afa0e720..f53bf2e56550c 100644
--- a/pkgs/development/python-modules/libthumbor/default.nix
+++ b/pkgs/development/python-modules/libthumbor/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Python extension to thumbor";
     homepage = "https://github.com/heynemann/libthumbor";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index 9edaed6ee6bf3..cf53ab4a50e03 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -99,6 +99,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/alisaifee/limits";
     changelog = "https://github.com/alisaifee/limits/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix
index 07143b4c30f80..ce34a64ee913d 100644
--- a/pkgs/development/python-modules/linode/default.nix
+++ b/pkgs/development/python-modules/linode/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ghickman/linode";
     description = "Thin python wrapper around Linode's API";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix
index ac518e81ff17e..bce9db1f7ec38 100644
--- a/pkgs/development/python-modules/lit/default.nix
+++ b/pkgs/development/python-modules/lit/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "lit";
     homepage = "http://llvm.org/docs/CommandGuide/lit.html";
     license = lib.licenses.ncsa;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix
index 6024da51f2fac..6bb69be09fcec 100644
--- a/pkgs/development/python-modules/lml/default.nix
+++ b/pkgs/development/python-modules/lml/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Load me later. A lazy plugin management system for Python";
     homepage = "http://lml.readthedocs.io/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix
index 10cfa9c8958ad..638f4328abf49 100644
--- a/pkgs/development/python-modules/localstack-client/default.nix
+++ b/pkgs/development/python-modules/localstack-client/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Lightweight Python client for LocalStack";
     homepage = "https://github.com/localstack/localstack-python-client";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix
index b0287a226a67a..4ebb8c0b41850 100644
--- a/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/pkgs/development/python-modules/localstack-ext/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     description = "Extensions for LocalStack";
     homepage = "https://github.com/localstack/localstack";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix
index 7bcb46fa595c0..28653b44380a8 100644
--- a/pkgs/development/python-modules/localstack/default.nix
+++ b/pkgs/development/python-modules/localstack/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     description = "Fully functional local Cloud stack";
     homepage = "https://github.com/localstack/localstack";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix
index 1d7de41098500..62a00fa1c8fab 100644
--- a/pkgs/development/python-modules/logbook/default.nix
+++ b/pkgs/development/python-modules/logbook/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://logbook.readthedocs.io/";
     changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
index 3e2797b6d675c..cac45f9dd0073 100644
--- a/pkgs/development/python-modules/logilab/common.nix
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     homepage = "https://logilab-common.readthedocs.io/";
     changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "logilab-pytest";
   };
 }
diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix
index 419ef5b4d1c70..fb98ada28f7cd 100644
--- a/pkgs/development/python-modules/logilab/constraint.nix
+++ b/pkgs/development/python-modules/logilab/constraint.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://forge.extranet.logilab.fr/open-source/logilab-constraint";
     changelog = "https://forge.extranet.logilab.fr/open-source/logilab-constraint/-/blob/${version}/CHANGELOG.md";
     license = licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix
index b79e6af6c9786..eb0e1ebd53685 100644
--- a/pkgs/development/python-modules/logutils/default.nix
+++ b/pkgs/development/python-modules/logutils/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Logging utilities";
     homepage = "https://bitbucket.org/vinay.sajip/logutils/";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/lottie/default.nix b/pkgs/development/python-modules/lottie/default.nix
new file mode 100644
index 0000000000000..a1ced236e8c8f
--- /dev/null
+++ b/pkgs/development/python-modules/lottie/default.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildPythonPackage,
+  distutils,
+  fetchPypi,
+  setuptools,
+}:
+buildPythonPackage rec {
+  pname = "lottie";
+  version = "0.7.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-oyQvi6NwUfvddQPs0WggOgjkrybxe+LsygimSvHn08E=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ distutils ];
+
+  pythonImportsCheck = [ "lottie" ];
+
+  meta = with lib; {
+    description = "Framework to work with lottie files and telegram animated stickers (tgs)";
+    homepage = "https://gitlab.com/mattbas/python-lottie/";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ Scrumplex ];
+  };
+}
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index f53979f98d7c4..bc09e20503e9a 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Pythonic binding for the libxml2 and libxslt libraries";
     homepage = "https://lxml.de";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix
index c37eeab5cc12f..627aa8a446a87 100644
--- a/pkgs/development/python-modules/lz4/default.nix
+++ b/pkgs/development/python-modules/lz4/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-lz4/python-lz4";
     changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
index 88f09710151ff..75f1e94f3bb26 100644
--- a/pkgs/development/python-modules/m2crypto/default.nix
+++ b/pkgs/development/python-modules/m2crypto/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/m2crypto/m2crypto";
     changelog = "https://gitlab.com/m2crypto/m2crypto/-/blob/${version}/CHANGES";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index 545f9df3c5a54..d96b03dfd35af 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -271,6 +271,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/ManimCommunity/manim";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix
index b7fe03e24f8af..e86a3760bc975 100644
--- a/pkgs/development/python-modules/mapbox-earcut/default.nix
+++ b/pkgs/development/python-modules/mapbox-earcut/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
       library, which provides very fast and quite robust triangulation of 2D
       polygons.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 44b702a12711b..2639001081e1e 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "marimo";
-  version = "0.7.11";
+  version = "0.7.12";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-yyz0gCdyMHSCoyaMr+cqW4/kmEmaufAl2PrNVYCovOg=";
+    hash = "sha256-YrxxqFLSNF5KZV8dDUnr6VT4r5ECErOfguQSCdAsgO4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix
index 3ee1e476665d8..dbc7a43d30f99 100644
--- a/pkgs/development/python-modules/markdown-include/default.nix
+++ b/pkgs/development/python-modules/markdown-include/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Extension to Python-Markdown which provides an include function";
     homepage = "https://github.com/cmacmackin/markdown-include";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index ab0025afd9835..587e819855321 100644
--- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
     changelog = "https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix
index aab6d31a18767..304f143b884b0 100644
--- a/pkgs/development/python-modules/matchpy/default.nix
+++ b/pkgs/development/python-modules/matchpy/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Library for pattern matching on symbolic expressions";
     homepage = "https://github.com/HPAC/matchpy";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix
index 603809455ffc4..e12969a95c141 100644
--- a/pkgs/development/python-modules/matplotlib-inline/default.nix
+++ b/pkgs/development/python-modules/matplotlib-inline/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Matplotlib Inline Back-end for IPython and Jupyter";
     homepage = "https://github.com/ipython/matplotlib-inline";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/maxcube-api/default.nix b/pkgs/development/python-modules/maxcube-api/default.nix
index e87568c88e517..f82fc861bb4eb 100644
--- a/pkgs/development/python-modules/maxcube-api/default.nix
+++ b/pkgs/development/python-modules/maxcube-api/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "eQ-3/ELV MAX! Cube Python API";
     homepage = "https://github.com/hackercowboy/python-maxcube-api";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix
index 0457ad15cd50c..d510be3b3a2cd 100644
--- a/pkgs/development/python-modules/maxminddb/default.nix
+++ b/pkgs/development/python-modules/maxminddb/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python";
     changelog = "https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v${version}/HISTORY.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix
index ccb9936a71511..05b5367517d7f 100644
--- a/pkgs/development/python-modules/maya/default.nix
+++ b/pkgs/development/python-modules/maya/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/timofurrer/maya";
     changelog = "https://github.com/timofurrer/maya/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix
index c8cb357cdc980..b46d2f5a755fa 100644
--- a/pkgs/development/python-modules/mccabe/default.nix
+++ b/pkgs/development/python-modules/mccabe/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "McCabe checker, plugin for flake8";
     homepage = "https://github.com/flintwork/mccabe";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index a84fe51da4f2b..97fa01697e491 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-mechanize/mechanize";
     changelog = "https://github.com/python-mechanize/mechanize/blob/v${version}/ChangeLog";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix
index 22d02db447b27..b40b9aca05a36 100644
--- a/pkgs/development/python-modules/merge3/default.nix
+++ b/pkgs/development/python-modules/merge3/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     mainProgram = "merge3";
     homepage = "https://github.com/breezy-team/merge3";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix
index 270604f782ea8..33b06eadfbd3c 100644
--- a/pkgs/development/python-modules/mido/default.nix
+++ b/pkgs/development/python-modules/mido/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://mido.readthedocs.io";
     changelog = "https://github.com/mido/mido/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix
index 76c1cbba0da1c..910b46a512127 100644
--- a/pkgs/development/python-modules/migen/default.nix
+++ b/pkgs/development/python-modules/migen/default.nix
@@ -1,31 +1,36 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+  setuptools,
   colorama,
+  pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "migen";
-  version = "unstable-2022-09-02";
-  format = "setuptools";
+  version = "unstable-2024-07-21";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "migen";
-    rev = "639e66f4f453438e83d86dc13491b9403bbd8ec6";
-    hash = "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec=";
+    rev = "9279e8623f8433bc4f23ac51e5e2331bfe544417";
+    hash = "sha256-z3LRhNmKZrjr6rFD0yxtccSa/SWvFIYmb+G/D5d2Jd8=";
   };
 
+  nativeBuildInputs = [ setuptools ];
+
   propagatedBuildInputs = [ colorama ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   pythonImportsCheck = [ "migen" ];
 
-  meta = with lib; {
+  meta = {
     description = " A Python toolbox for building complex digital hardware";
     homepage = "https://m-labs.hk/migen";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ l-as ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ l-as ];
   };
 }
diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix
index 55c7f7d573ad3..934c77440529d 100644
--- a/pkgs/development/python-modules/mike/default.nix
+++ b/pkgs/development/python-modules/mike/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     mainProgram = "mike";
     homepage = "https://github.com/jimporter/mike";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/misoc/default.nix b/pkgs/development/python-modules/misoc/default.nix
index a7b2198041fb5..e573760769be3 100644
--- a/pkgs/development/python-modules/misoc/default.nix
+++ b/pkgs/development/python-modules/misoc/default.nix
@@ -9,16 +9,16 @@
   numpy,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "misoc";
-  version = "unstable-2022-10-08";
+  version = "0-unstable-2024-05-14";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "m-labs";
     repo = "misoc";
-    rev = "6a7c670ab6120b8136f652c41d907eb0fb16ed54";
-    hash = "sha256-dLDp0xg5y5b443hD7vbJFobHxbhtnj68RdZnQ7ckgp4=";
+    rev = "fea9de558c730bc394a5936094ae95bb9d6fa726";
+    hash = "sha256-zZ9LnUwvTvBL9iNFfmNTklQnd0I4PmV0BApMSblTnc0=";
   };
 
   propagatedBuildInputs = [
@@ -32,10 +32,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "misoc" ];
 
-  meta = with lib; {
+  meta = {
     description = "Original high performance and small footprint system-on-chip based on Migen";
     homepage = "https://github.com/m-labs/misoc";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ doronbehar ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ doronbehar ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-get-deps/default.nix b/pkgs/development/python-modules/mkdocs-get-deps/default.nix
index 72d4fce4fa10d..3b36dfb7fea22 100644
--- a/pkgs/development/python-modules/mkdocs-get-deps/default.nix
+++ b/pkgs/development/python-modules/mkdocs-get-deps/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "An extra command for MkDocs that infers required PyPI packages from `plugins` in mkdocs.yml";
     homepage = "https://github.com/mkdocs/get-deps";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index edb8563ed272b..b5f17fbe9cd4a 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.5.29";
+  version = "9.5.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "squidfunk";
     repo = "mkdocs-material";
     rev = "refs/tags/${version}";
-    hash = "sha256-ebn19oD1Q+HYo9tksiDX1FlKKaB4U/bN51JCHXxSHx8=";
+    hash = "sha256-VgOPmOwPAwTqCCDxtiQ3dReTdjfXYL7/1CdSqTgw+uo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index 890bdc7b0a347..0056beaa92225 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin";
     changelog = "https://github.com/fralau/mkdocs-mermaid2-plugin/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix
index 547c7f7b884a4..9e09b91850d32 100644
--- a/pkgs/development/python-modules/mmh3/default.nix
+++ b/pkgs/development/python-modules/mmh3/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/hajimes/mmh3";
     changelog = "https://github.com/hajimes/mmh3/blob/v${version}/CHANGELOG.md";
     license = licenses.cc0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix
index 82065268cfeb5..cfa7d4e698c84 100644
--- a/pkgs/development/python-modules/mobi/default.nix
+++ b/pkgs/development/python-modules/mobi/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     mainProgram = "mobiunpack";
     homepage = "https://github.com/iscc/mobi";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix
index a76b460857af3..323633d3a4398 100644
--- a/pkgs/development/python-modules/mocket/default.nix
+++ b/pkgs/development/python-modules/mocket/default.nix
@@ -106,6 +106,6 @@ buildPythonPackage rec {
     description = "Socket mock framework for all kinds of sockets including web-clients";
     homepage = "https://github.com/mindflayer/python-mocket";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix
index 7f069557ed7a0..5e6da22c91d41 100644
--- a/pkgs/development/python-modules/mockfs/default.nix
+++ b/pkgs/development/python-modules/mockfs/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mockfs/mockfs";
     changelog = "https://github.com/mockfs/mockfs/blob/${src.rev}/CHANGES.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix
index 0130714fecf73..ea2b3c43509d0 100644
--- a/pkgs/development/python-modules/more-itertools/default.nix
+++ b/pkgs/development/python-modules/more-itertools/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     changelog = "https://more-itertools.readthedocs.io/en/stable/versions.html";
     description = "Expansion of the itertools module";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix
index 6cc5ccc507f2f..ec5e39c6b8ab1 100644
--- a/pkgs/development/python-modules/mortgage/default.nix
+++ b/pkgs/development/python-modules/mortgage/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Mortgage calculator";
     homepage = "https://github.com/jlumbroso/mortgage";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/motmetrics/default.nix b/pkgs/development/python-modules/motmetrics/default.nix
index 891497a702a10..74a0fade7bd99 100644
--- a/pkgs/development/python-modules/motmetrics/default.nix
+++ b/pkgs/development/python-modules/motmetrics/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Bar_chart: Benchmark multiple object trackers (MOT) in Python";
     homepage = "https://github.com/cheind/py-motmetrics";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 23cc5ba5e4850..1c9e917b60abb 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -94,6 +94,6 @@ buildPythonPackage rec {
     homepage = "https://zulko.github.io/moviepy/";
     changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix
new file mode 100644
index 0000000000000..0714dd07bcff1
--- /dev/null
+++ b/pkgs/development/python-modules/mozart-api/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  poetry-core,
+  aenum,
+  aioconsole,
+  aiohttp,
+  inflection,
+  pydantic,
+  python-dateutil,
+  typing-extensions,
+  urllib3,
+  websockets,
+  zeroconf,
+}:
+
+buildPythonPackage rec {
+  pname = "mozart-api";
+  version = "3.4.1.8.6";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchPypi {
+    pname = "mozart_api";
+    inherit version;
+    hash = "sha256-a0yjVS1FnR/n7Hjw/VRFztkUFD0gQQg7OXbyPTf+Kus=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aenum
+    aioconsole
+    aiohttp
+    inflection
+    pydantic
+    python-dateutil
+    typing-extensions
+    urllib3
+    websockets
+    zeroconf
+  ];
+
+  # Package has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "mozart_api" ];
+
+  meta = {
+    description = "REST API for the Bang & Olufsen Mozart platform";
+    homepage = "https://github.com/bang-olufsen/mozart-open-api";
+    changelog = "https://github.com/bang-olufsen/mozart-open-api/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix
index bbd0befe1415e..cae321df5c0b4 100644
--- a/pkgs/development/python-modules/mpyq/default.nix
+++ b/pkgs/development/python-modules/mpyq/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     mainProgram = "mpyq";
     homepage = "https://github.com/eagleflo/mpyq";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix
index deb6e0c6ca627..669fee8887fb0 100644
--- a/pkgs/development/python-modules/mrjob/default.nix
+++ b/pkgs/development/python-modules/mrjob/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     description = "Run MapReduce jobs on Hadoop or Amazon Web Services";
     homepage = "https://github.com/Yelp/mrjob";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index 3a664b3933f23..beec1bb17ee5f 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/WoLpH/mt940";
     changelog = "https://github.com/wolph/mt940/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix
index c7d8258e89797..569988aabb9d7 100644
--- a/pkgs/development/python-modules/mujoco/default.nix
+++ b/pkgs/development/python-modules/mujoco/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   # in the project's CI.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fPiIdSbwcedBHcAs4c1mXjm0tgg/3/Sf4TSKgtIxRlE=";
+    hash = "sha256-R388jEIbzd60en1SRC8mKSSlvdW/xWl1xDnUET7QvKc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix
index 57e69de0e7854..98a3ad4c563b6 100644
--- a/pkgs/development/python-modules/multiprocess/default.nix
+++ b/pkgs/development/python-modules/multiprocess/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Multiprocessing and multithreading in Python";
     homepage = "https://github.com/uqfoundation/multiprocess";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix
index d5b6fe944ae27..6f7bf72c4a6e2 100644
--- a/pkgs/development/python-modules/mutag/default.nix
+++ b/pkgs/development/python-modules/mutag/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage {
     description = "Script to change email tags in a mu indexed maildir";
     homepage = "https://github.com/aroig/mutag";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mutag";
   };
 }
diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix
index e7219e60753fd..c66f33c6d9889 100644
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@@ -76,6 +76,6 @@ buildPythonPackage rec {
       lib.replaceStrings [ "." ] [ "-" ] version
     }";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
index 72fa00155f380..1bdc53e90d012 100644
--- a/pkgs/development/python-modules/mwclient/default.nix
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Python client library to the MediaWiki API";
     license = licenses.mit;
     homepage = "https://github.com/mwclient/mwclient";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix
index 02f1f07ff6d19..8205ba66befeb 100644
--- a/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/pkgs/development/python-modules/mygpoclient/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/gpodder/mygpoclient";
     license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix
index 4be14e85100ea..97628a5e3e87d 100644
--- a/pkgs/development/python-modules/myst-nb/default.nix
+++ b/pkgs/development/python-modules/myst-nb/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/MyST-NB";
     changelog = "https://github.com/executablebooks/MyST-NB/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
index daafd9190c16b..dffd114bd0754 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/derek73/python-nameparser";
     changelog = "https://github.com/derek73/python-nameparser/releases/tag/v${version}";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nanoid/default.nix b/pkgs/development/python-modules/nanoid/default.nix
index 48d1f3f44411b..1570c28f9e66a 100644
--- a/pkgs/development/python-modules/nanoid/default.nix
+++ b/pkgs/development/python-modules/nanoid/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Tiny, secure, URL-friendly, unique string ID generator for Python";
     homepage = "https://github.com/puyuan/py-nanoid";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix
index 995c56510d65a..59f9e82d48c4b 100644
--- a/pkgs/development/python-modules/nanoleaf/default.nix
+++ b/pkgs/development/python-modules/nanoleaf/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/software-2/nanoleaf";
     changelog = "https://github.com/software-2/nanoleaf/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix
index e7492f0f55ffc..a44fe0becfe31 100644
--- a/pkgs/development/python-modules/napalm/hp-procurve.nix
+++ b/pkgs/development/python-modules/napalm/hp-procurve.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "HP ProCurve Driver for NAPALM automation frontend";
     homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index d8001e5bd1086..4183a65e56c0e 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/SethMMorton/natsort";
     changelog = "https://github.com/SethMMorton/natsort/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix
index 4a15448d0839b..aac9c4e6ef259 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://nbsphinx.readthedocs.io/";
     changelog = "https://github.com/spatialaudio/nbsphinx/blob/${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
index 7cc16ab27ff29..920314b9e45d5 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/computationalmodelling/nbval";
     changelog = "https://github.com/computationalmodelling/nbval/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix
index 7ebffc30c4492..6773eed000c8e 100644
--- a/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";
     mainProgram = "ndg_httpclient";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix
index 567476d4985cb..ee44e9b1544ce 100644
--- a/pkgs/development/python-modules/ndindex/default.nix
+++ b/pkgs/development/python-modules/ndindex/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Quansight-Labs/ndindex";
     changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index d1a6903a666b0..f99be6637f605 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "neo4j";
-  version = "5.22.0";
+  version = "5.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "neo4j";
     repo = "neo4j-python-driver";
     rev = "refs/tags/${version}";
-    hash = "sha256-/yilbKui0D49zviNM9MI5ElGAYPB3MlbMgpDyI1kVX8=";
+    hash = "sha256-IeRPjhjPKr65lUNltERvaHmxHhRJwUfXbyjrnDnBbR8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 45dc089f74d5a..f73c569fddacc 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/erdewit/nest_asyncio";
     changelog = "https://github.com/erdewit/nest_asyncio/releases/tag/v${version}";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index d6b76137657eb..911ea8afefd95 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -70,7 +70,7 @@ buildPythonPackage rec {
     description = "Interface to netCDF library (versions 3 and 4)";
     homepage = "https://github.com/Unidata/netcdf4-python";
     changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix
index 381b8818e77d0..8133131a4277d 100644
--- a/pkgs/development/python-modules/netifaces/default.nix
+++ b/pkgs/development/python-modules/netifaces/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Portable access to network interfaces from Python";
     homepage = "https://github.com/al45tair/netifaces";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix
index a0b65797ff43e..5c4b270d2e7af 100644
--- a/pkgs/development/python-modules/nix-kernel/default.nix
+++ b/pkgs/development/python-modules/nix-kernel/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Simple jupyter kernel for nix-repl";
     homepage = "https://github.com/GTrunSec/nix-kernel";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 2c71a15a021e8..8b4b88fbc15d0 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     mainProgram = "nltk";
     homepage = "http://nltk.org/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 90815a55efb6e..72ca86fc28c1a 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Port of node-semver";
     homepage = "https://github.com/podhmo/python-semver";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix
index 6ee3b9033f3dd..45c8ed59fabdc 100644
--- a/pkgs/development/python-modules/nodeenv/default.nix
+++ b/pkgs/development/python-modules/nodeenv/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ekalinin/nodeenv";
     changelog = "https://github.com/ekalinin/nodeenv/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/noiseprotocol/default.nix b/pkgs/development/python-modules/noiseprotocol/default.nix
index 8192e2dd4f30d..7e42d2eb2515a 100644
--- a/pkgs/development/python-modules/noiseprotocol/default.nix
+++ b/pkgs/development/python-modules/noiseprotocol/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/plizonczyk/noiseprotocol/";
     changelog = "https://github.com/plizonczyk/noiseprotocol/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nose-xunitmp/default.nix b/pkgs/development/python-modules/nose-xunitmp/default.nix
deleted file mode 100644
index 18c235dfaade0..0000000000000
--- a/pkgs/development/python-modules/nose-xunitmp/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  wheel,
-  nose,
-}:
-
-buildPythonPackage rec {
-  pname = "nose-xunitmp";
-  version = "0.4.1";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "nose_xunitmp";
-    inherit version;
-    hash = "sha256-wt9y9HYHUdMBU9Rzgiqr8afD1GL2ZKp/f9uNxibcfEA=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ nose ];
-
-  pythonImportsCheck = [ "nose_xunitmp" ];
-
-  meta = {
-    description = "Xunit output when running multiprocess tests using nose";
-    homepage = "https://pypi.org/project/nose_xunitmp/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
-  };
-}
diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix
index 1a58b6998aefd..308039cc61d7e 100644
--- a/pkgs/development/python-modules/nose/default.nix
+++ b/pkgs/development/python-modules/nose/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     mainProgram = "nosetests";
     homepage = "https://nose.readthedocs.io/";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix
index 95a564c14c58d..b2a65a5648ef3 100644
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/pkgs/development/python-modules/nose2/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     mainProgram = "nose2";
     homepage = "https://github.com/nose-devs/nose2";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
index 11c17bd7516f7..b61ef87c8873e 100644
--- a/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/jupyter/notebook_shim";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix
index eb5f017e0e3da..47f23ed99fed2 100644
--- a/pkgs/development/python-modules/notmuch/default.nix
+++ b/pkgs/development/python-modules/notmuch/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage {
     description = "Python wrapper around notmuch";
     homepage = "https://notmuchmail.org/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nototools/default.nix b/pkgs/development/python-modules/nototools/default.nix
index ea555a5e0977d..8dc075e2b47c6 100644
--- a/pkgs/development/python-modules/nototools/default.nix
+++ b/pkgs/development/python-modules/nototools/default.nix
@@ -102,6 +102,6 @@ buildPythonPackage rec {
     description = "Noto fonts support tools and scripts plus web site generation";
     homepage = "https://github.com/googlefonts/nototools";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix
index 478a401501806..722570a25870d 100644
--- a/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/pkgs/development/python-modules/ntc-templates/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/networktocode/ntc-templates";
     changelog = "https://github.com/networktocode/ntc-templates/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix
new file mode 100644
index 0000000000000..ac7d35419835e
--- /dev/null
+++ b/pkgs/development/python-modules/nuclear/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  colorama,
+  mock,
+  pyyaml,
+  pydantic,
+  backoff,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "nuclear";
+  version = "2.2.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "igrek51";
+    repo = "nuclear";
+    rev = version;
+    hash = "sha256-JuO7BKmlQE6bWKqy1QvX5U4A9YkKu/4ouTSJh9R7JGo=";
+  };
+
+  build-system = [ setuptools ];
+  dependencies = [
+    colorama
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    mock
+    pydantic
+    backoff
+  ];
+  disabledTestPaths = [
+    # Disabled because test tries to install bash in a non-NixOS way
+    "tests/autocomplete/test_bash_install.py"
+  ];
+  disabledTests = [
+    # Setting the time zone in nix sandbox does not work - to be investigated
+    "test_context_logger"
+  ];
+  pythonImportsCheck = [ "nuclear" ];
+
+  meta = with lib; {
+    homepage = "https://igrek51.github.io/nuclear/";
+    description = "Binding glue for CLI Python applications";
+    license = licenses.mit;
+    maintainers = with maintainers; [ parras ];
+  };
+}
diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix
index 8e122271c4789..cde2beff63bd9 100644
--- a/pkgs/development/python-modules/num2words/default.nix
+++ b/pkgs/development/python-modules/num2words/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     mainProgram = "num2words";
     homepage = "https://github.com/savoirfairelinux/num2words";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
 
     longDescription = "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second";
   };
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 0368e3217968c..f54dcb03b526b 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     description = "Fast numerical array expression evaluator for NumPy";
     homepage = "https://github.com/pydata/numexpr";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix
index 100adcfc424f7..fd1911a818756 100644
--- a/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/pkgs/development/python-modules/numpy-stl/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Library to make reading, writing and modifying both binary and ascii STL files easy";
     homepage = "https://github.com/WoLpH/numpy-stl/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index d0c88698a6c04..81be2102daddd 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -81,6 +81,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/lilydjwg/nvchecker";
     changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix
index a45aa21abf37e..17ea759ce4f50 100644
--- a/pkgs/development/python-modules/oauth2/default.nix
+++ b/pkgs/development/python-modules/oauth2/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/simplegeo/python-oauth2";
     description = "Library for OAuth version 1.0";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix
index c6fc4b6b290c9..895c988381e9b 100644
--- a/pkgs/development/python-modules/oauth2client/default.nix
+++ b/pkgs/development/python-modules/oauth2client/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Client library for OAuth 2.0";
     homepage = "https://github.com/google/oauth2client/";
-    license = licenses.bsd2;
+    license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index 1f4ff0ea627f7..4b25347faeff6 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -85,6 +85,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jupyterhub/oauthenticator";
     changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix
index f9e9a5bee056f..1c3c8bf8ff4b1 100644
--- a/pkgs/development/python-modules/od/default.nix
+++ b/pkgs/development/python-modules/od/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Shorthand syntax for building OrderedDicts";
     homepage = "https://github.com/epsy/od";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index 4db5cface1573..fae10081d33b9 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ollama";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "ollama";
     repo = "ollama-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+qgWkfrsWeEpU3hiH0KFQSVvF6e7tzMEzXjJJGUSyOU=";
+    hash = "sha256-uz2mUcFFVeJ+85DElJ3kcxpke3DZjXl91FJ+6tYGj9c=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/omemo-dr/default.nix b/pkgs/development/python-modules/omemo-dr/default.nix
index e6b1317738c1d..83e221c729c61 100644
--- a/pkgs/development/python-modules/omemo-dr/default.nix
+++ b/pkgs/development/python-modules/omemo-dr/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://dev.gajim.org/gajim/omemo-dr/";
     changelog = "https://dev.gajim.org/gajim/omemo-dr/-/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix
index 371118f677d03..a36c97dd2cdac 100644
--- a/pkgs/development/python-modules/opcua-widgets/default.nix
+++ b/pkgs/development/python-modules/opcua-widgets/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Common widgets for opcua-modeler og opcua-client-gui";
     homepage = "https://github.com/FreeOpcUa/opcua-widgets";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/opencontainers/default.nix b/pkgs/development/python-modules/opencontainers/default.nix
index b2677b7044e40..b5672a5590f21 100644
--- a/pkgs/development/python-modules/opencontainers/default.nix
+++ b/pkgs/development/python-modules/opencontainers/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Python module for oci specifications";
     homepage = "https://github.com/vsoch/oci-python";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix
index afd98f1f61ede..5bf0f23accba2 100644
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@@ -11,12 +11,14 @@
   keystoneauth1,
   munch,
   netifaces,
+  openstackdocstheme,
   os-service-types,
   pbr,
   pythonOlder,
   pyyaml,
   requestsexceptions,
   setuptools,
+  sphinxHook,
 }:
 
 buildPythonPackage rec {
@@ -26,12 +28,29 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    # Disable rsvgconverter not needed to build manpage
+    substituteInPlace doc/source/conf.py \
+      --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter',"
+  '';
+
+  build-system = [
+    openstackdocstheme
+    setuptools
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
 
   dependencies = [
     platformdirs
diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix
index a498127b4f116..20825a18b5500 100644
--- a/pkgs/development/python-modules/orm/default.nix
+++ b/pkgs/development/python-modules/orm/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Async ORM";
     homepage = "https://github.com/encode/orm";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix
index 1ddfce166c382..fe80b0ac42d44 100644
--- a/pkgs/development/python-modules/oscrypto/default.nix
+++ b/pkgs/development/python-modules/oscrypto/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     description = "Encryption library for Python";
     homepage = "https://github.com/wbond/oscrypto";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix
index f034d572b3b6c..d37aa9bdc6844 100644
--- a/pkgs/development/python-modules/panel/default.nix
+++ b/pkgs/development/python-modules/panel/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/holoviz/panel";
     changelog = "https://github.com/holoviz/panel/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 280f541b32f4c..2a5352b9d0580 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -107,7 +107,7 @@ buildPythonPackage rec {
     description = "Parametrize and run Jupyter and interact with notebooks";
     homepage = "https://github.com/nteract/papermill";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "papermill";
   };
 }
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 7d6baeeee5d66..8f5975a9517df 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://param.holoviz.org/";
     changelog = "https://github.com/holoviz/param/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix
index 04bcad91f36f7..8af2b491701d1 100644
--- a/pkgs/development/python-modules/parameterized/default.nix
+++ b/pkgs/development/python-modules/parameterized/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/wolever/parameterized";
     changelog = "https://github.com/wolever/parameterized/blob/v${version}/CHANGELOG.txt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
index e5909fca7b3c9..248dc1f513189 100644
--- a/pkgs/development/python-modules/paramiko/default.nix
+++ b/pkgs/development/python-modules/paramiko/default.nix
@@ -85,6 +85,6 @@ buildPythonPackage rec {
       between python scripts. All major ciphers and hash methods are
       supported. SFTP client and server mode are both supported too.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix
index e0e55e49f35a8..4751f655974df 100644
--- a/pkgs/development/python-modules/parfive/default.nix
+++ b/pkgs/development/python-modules/parfive/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     mainProgram = "parfive";
     homepage = "https://parfive.readthedocs.io/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix
index f07e2a1e043f7..b187ba40a2780 100644
--- a/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/pkgs/development/python-modules/parsedatetime/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Parse human-readable date/time text";
     homepage = "https://github.com/bear/parsedatetime";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix
index 1c25d44e39c6f..c99aafd447ea2 100644
--- a/pkgs/development/python-modules/parsimonious/default.nix
+++ b/pkgs/development/python-modules/parsimonious/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Arbitrary-lookahead parser";
     homepage = "https://github.com/erikrose/parsimonious";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index 546699b2ab0c1..af12a98352838 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Allows parsing and manipulation of PEP 440 version numbers";
     homepage = "https://github.com/RazerM/parver";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 786cfc618d5b2..413e6ecb1c943 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Password hashing library for Python";
     homepage = "https://foss.heptapod.net/python-libs/passlib";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix
index cbe0e02928a9f..e4261359d59cc 100644
--- a/pkgs/development/python-modules/paste/default.nix
+++ b/pkgs/development/python-modules/paste/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://pythonpaste.readthedocs.io/";
     changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix
index 597d98bd961df..384ca52949ec0 100644
--- a/pkgs/development/python-modules/pastescript/default.nix
+++ b/pkgs/development/python-modules/pastescript/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     mainProgram = "paster";
     homepage = "https://github.com/cdent/pastescript/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix
index 9703edabc12f3..d7f28f166a052 100644
--- a/pkgs/development/python-modules/path/default.nix
+++ b/pkgs/development/python-modules/path/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jaraco/path";
     changelog = "https://github.com/jaraco/path/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix
index 0eb8930822ad0..c1a8c632cbc68 100644
--- a/pkgs/development/python-modules/pathlib-abc/default.nix
+++ b/pkgs/development/python-modules/pathlib-abc/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/barneygale/pathlib-abc";
     changelog = "https://github.com/barneygale/pathlib-abc/blob/${version}/CHANGES.rst";
     license = licenses.psfl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 5cbe0f41d36f9..c439b1b04cf9f 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems";
     homepage = "https://pypi.org/project/pathlib2/";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix
index 75bdc9eaeb645..b548dd3c6f0ba 100644
--- a/pkgs/development/python-modules/pathos/default.nix
+++ b/pkgs/development/python-modules/pathos/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://pathos.readthedocs.io/";
     changelog = "https://github.com/uqfoundation/pathos/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix
index e665813250708..ed728e0fe1e8b 100644
--- a/pkgs/development/python-modules/paypalrestsdk/default.nix
+++ b/pkgs/development/python-modules/paypalrestsdk/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
       fullName = "PayPal SDK License";
       url = "https://github.com/paypal/PayPal-Python-SDK/blob/master/LICENSE";
     };
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index a905568ffc7b1..fb0068dd31a60 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/frostming/pbs-installer";
     changelog = "https://github.com/frostming/pbs-installer/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix
index 6bdd81de8bbca..c8759c4601fea 100644
--- a/pkgs/development/python-modules/pdfx/default.nix
+++ b/pkgs/development/python-modules/pdfx/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF";
     mainProgram = "pdfx";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index 8116af981ac9e..e1c9505b40df6 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     homepage = "http://peewee-orm.com";
     changelog = "https://github.com/coleifer/peewee/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pwiz.py";
   };
 }
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
index fb412e99c0d5c..1a13b5a10fe60 100644
--- a/pkgs/development/python-modules/pendulum/default.nix
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -92,6 +92,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sdispater/pendulum";
     changelog = "https://github.com/sdispater/pendulum/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix
index 01e2928707979..7a9c442d4219c 100644
--- a/pkgs/development/python-modules/pep8/default.nix
+++ b/pkgs/development/python-modules/pep8/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Python style guide checker";
     mainProgram = "pep8";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix
index b8c37ed5d6f97..78cd6bdaf9994 100644
--- a/pkgs/development/python-modules/perfplot/default.nix
+++ b/pkgs/development/python-modules/perfplot/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/nschloe/perfplot";
     changelog = "https://github.com/nschloe/perfplot/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 058b613fa2f4f..59892262e6978 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     homepage = "https://persim.scikit-tda.org";
     changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index cffa4633a117f..644ac8d2e5173 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zopefoundation/persistent/";
     changelog = "https://github.com/zopefoundation/persistent/blob/${version}/CHANGES.rst";
     license = licenses.zpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index 4fe0061f3392b..edf70ea2cb9dc 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     description = "PostgreSQL Languages AST and statements prettifier";
     changelog = "https://github.com/lelit/pglast/blob/v${version}/CHANGES.rst";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pgpp";
   };
 }
diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 6ce163dd74c40..e632972198900 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dbcli/pgspecial";
     changelog = "https://github.com/dbcli/pgspecial/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix
index 66edfc945b0d4..114a16888632c 100644
--- a/pkgs/development/python-modules/phonemizer/default.nix
+++ b/pkgs/development/python-modules/phonemizer/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Simple text to phones converter for multiple languages";
     mainProgram = "phonemize";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index f6a71c1a37c15..d520087a17d0a 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/pika/pika";
     homepage = "https://pika.readthedocs.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix
index f061a17048b83..e913a10b4fbfd 100644
--- a/pkgs/development/python-modules/pillow-simd/default.nix
+++ b/pkgs/development/python-modules/pillow-simd/default.nix
@@ -55,7 +55,7 @@ import ../pillow/generic.nix (
         Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support.
       '';
       license = licenses.hpnd;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   }
   // args
diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix
index ca8a72fff516b..c016d45ffae58 100644
--- a/pkgs/development/python-modules/pims/default.nix
+++ b/pkgs/development/python-modules/pims/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/soft-matter/pims";
     changelog = "https://github.com/soft-matter/pims/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix
index da4cef42adf92..87d275cf7c0b8 100644
--- a/pkgs/development/python-modules/pipdate/default.nix
+++ b/pkgs/development/python-modules/pipdate/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     mainProgram = "pipdate";
     homepage = "https://github.com/nschloe/pipdate";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix
index bda5d66cf4ca4..23d5f748d3355 100644
--- a/pkgs/development/python-modules/pixelmatch/default.nix
+++ b/pkgs/development/python-modules/pixelmatch/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Pixel-level image comparison library";
     homepage = "https://github.com/whtsky/pixelmatch-py";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix
index 589721c4106e0..069ffd31a4ab0 100644
--- a/pkgs/development/python-modules/pkginfo/default.nix
+++ b/pkgs/development/python-modules/pkginfo/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
       setup.py develop).
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix
index 66aaa4e9425ba..d234636bb2ce2 100644
--- a/pkgs/development/python-modules/plac/default.nix
+++ b/pkgs/development/python-modules/plac/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     mainProgram = "plac_runner.py";
     homepage = "https://github.com/micheles/plac";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 94ff14306b77c..0585d596e74ad 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "PasteDeploy binding to the plaster configuration loader";
     homepage = "https://github.com/Pylons/plaster_pastedeploy";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 8c7751b766b55..6623b8ace1ee1 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/plotly/plotly.py";
     homepage = "https://plot.ly/python/";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index a6a77dd5cbfd2..42a9234a08d00 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     description = " Plumbum: Shell Combinators";
     homepage = " https://github.com/tomerfiliba/plumbum ";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix
index 5fbc757db88b6..302b67eea7b22 100644
--- a/pkgs/development/python-modules/plux/default.nix
+++ b/pkgs/development/python-modules/plux/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Dynamic code loading framework for building pluggable Python distributions";
     homepage = "https://github.com/localstack/plux";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
index 839ed1f303323..81b37969126cb 100644
--- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix
+++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python";
     homepage = "https://github.com/SkyTemple/pmdsky-debug-py";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index cf51068bc90c5..fec055b429bda 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     description = "Core utilities for Poetry";
     homepage = "https://github.com/python-poetry/poetry-core/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix
index edca7ccbd3ba1..bbf858356234b 100644
--- a/pkgs/development/python-modules/polling/default.nix
+++ b/pkgs/development/python-modules/polling/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Powerful polling utility in Python";
     homepage = "https://github.com/justiniso/polling";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix
index dc3dc7089d22b..0ac8753d382dc 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
   meta = with lib; {
     homepage = "https://github.com/frescobaldi/python-poppler-qt5";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix
index 53de4065ff12a..be7697d0d6aba 100644
--- a/pkgs/development/python-modules/portalocker/default.nix
+++ b/pkgs/development/python-modules/portalocker/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "Library to provide an easy API to file locking";
     homepage = "https://github.com/WoLpH/portalocker";
     license = licenses.psfl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix
index b19dd5b1bf107..61fd71319fad4 100644
--- a/pkgs/development/python-modules/portpicker/default.nix
+++ b/pkgs/development/python-modules/portpicker/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     mainProgram = "portserver.py";
     homepage = "https://github.com/google/python_portpicker";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/posix-ipc/default.nix b/pkgs/development/python-modules/posix-ipc/default.nix
index d081801ce48a5..6c78fc34830db 100644
--- a/pkgs/development/python-modules/posix-ipc/default.nix
+++ b/pkgs/development/python-modules/posix-ipc/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "POSIX IPC primitives (semaphores, shared memory and message queues)";
     homepage = "https://github.com/osvenskan/posix_ipc";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix
index f6e6f72755f89..fcf1f4e0701d5 100644
--- a/pkgs/development/python-modules/potr/default.nix
+++ b/pkgs/development/python-modules/potr/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     description = "Pure Python OTR implementation";
     homepage = "http://python-otr.pentabarf.de/";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix
index 2c82fc966e946..ffcf9616cb599 100644
--- a/pkgs/development/python-modules/pox/default.nix
+++ b/pkgs/development/python-modules/pox/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     mainProgram = "pox";
     homepage = "https://pox.readthedocs.io/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix
index ec61d57fc46c9..53eaa5657e7a3 100644
--- a/pkgs/development/python-modules/ppft/default.nix
+++ b/pkgs/development/python-modules/ppft/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://ppft.readthedocs.io/";
     changelog = "https://github.com/uqfoundation/ppft/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix
index 5802f01cc0006..7067bd61213e4 100644
--- a/pkgs/development/python-modules/precis-i18n/default.nix
+++ b/pkgs/development/python-modules/precis-i18n/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/byllyfish/precis_i18n";
     changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix
index e901288445585..d20e7eed1a78f 100644
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Cython hash tables that assume keys are pre-hashed";
     homepage = "https://github.com/explosion/preshed";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix
index 3e4396a4043c9..f35fcb5e9c872 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/pkgs/development/python-modules/pretend/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Module for stubbing";
     homepage = "https://github.com/alex/pretend";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix
index f7fd2f5bfca2f..53143aa47fbf6 100644
--- a/pkgs/development/python-modules/prettytable/default.nix
+++ b/pkgs/development/python-modules/prettytable/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jazzband/prettytable";
     changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix
index 32d7a9ead8c6b..5abb41f269103 100644
--- a/pkgs/development/python-modules/prison/default.nix
+++ b/pkgs/development/python-modules/prison/default.nix
@@ -2,14 +2,15 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   six,
-  nose,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "prison";
   version = "0.1.3";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "betodealmeida";
@@ -18,9 +19,11 @@ buildPythonPackage rec {
     hash = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc=";
   };
 
-  propagatedBuildInputs = [ six ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [ nose ];
+  dependencies = [ six ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Rison encoder/decoder";
diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix
index 765132c92ba52..8c4c1545c3504 100644
--- a/pkgs/development/python-modules/private-gpt/default.nix
+++ b/pkgs/development/python-modules/private-gpt/default.nix
@@ -93,6 +93,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zylon-ai/private-gpt";
     license = lib.licenses.asl20;
     mainProgram = "private-gpt";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix
index db541075d773d..9f0704d7a3d0b 100644
--- a/pkgs/development/python-modules/prometheus-client/default.nix
+++ b/pkgs/development/python-modules/prometheus-client/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/prometheus/client_python";
     changelog = "https://github.com/prometheus/client_python/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/prompt-toolkit/1.nix b/pkgs/development/python-modules/prompt-toolkit/1.nix
index 1a6dd3223df01..b50f5ef7cd4f4 100644
--- a/pkgs/development/python-modules/prompt-toolkit/1.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/1.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
       with a nice interactive Python shell (called ptpython) built on top.
     '';
     homepage = "https://github.com/jonathanslenders/python-prompt-toolkit";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix
index 0a415b1926fe4..c66dd4499ee41 100644
--- a/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jonathanslenders/python-prompt-toolkit";
     changelog = "https://github.com/prompt-toolkit/python-prompt-toolkit/blob/${version}/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix
index bfd17d74dcbfa..bf2fb99c36afa 100644
--- a/pkgs/development/python-modules/protego/default.nix
+++ b/pkgs/development/python-modules/protego/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/scrapy/protego";
     changelog = "https://github.com/scrapy/protego/blob/${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix
index bd8219751872e..7502d2daf3cc5 100644
--- a/pkgs/development/python-modules/prox-tv/default.nix
+++ b/pkgs/development/python-modules/prox-tv/default.nix
@@ -5,7 +5,8 @@
   buildPythonPackage,
   cffi,
   fetchFromGitHub,
-  nose,
+  setuptools,
+  pytestCheckHook,
   numpy,
   stdenv,
 }:
@@ -13,7 +14,7 @@
 buildPythonPackage {
   pname = "prox-tv";
   version = "3.3.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "albarji";
@@ -22,27 +23,26 @@ buildPythonPackage {
     sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5";
   };
 
-  nativeCheckInputs = [ nose ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     cffi
   ];
 
-  # this test is known to fail on darwin
-  checkPhase = ''
-    nosetests --exclude=test_tvp_1d ${lib.optionalString stdenv.isDarwin " --exclude=test_tv2_1d"}
-  '';
-
-  propagatedNativeBuildInputs = [ cffi ];
-
   buildInputs = [
     blas
     lapack
   ];
 
+  propagatedNativeBuildInputs = [ cffi ];
+
   enableParallelBuilding = true;
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.isDarwin [ "test_tv2_1d" ];
+
   meta = with lib; {
     homepage = "https://github.com/albarji/proxTV";
     description = "Toolbox for fast Total Variation proximity operators";
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 0b7a69a434fa9..4c0a93d2faa44 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -72,6 +72,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/giampaolo/psutil";
     changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index 471cff85da6ed..ec958d7525c94 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -72,6 +72,6 @@ buildPythonPackage rec {
       lgpl3Plus
       zpl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix
index 8847ef8a1bdc8..d88a7433f068e 100644
--- a/pkgs/development/python-modules/ptable/default.nix
+++ b/pkgs/development/python-modules/ptable/default.nix
@@ -2,13 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  nose,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage {
   pname = "ptable";
   version = "unstable-2019-06-14";
-  format = "setuptools";
+  pyproject = true;
 
   # https://github.com/kxxoling/PTable/issues/27
   src = fetchFromGitHub {
@@ -18,11 +19,9 @@ buildPythonPackage {
     sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i";
   };
 
-  nativeCheckInputs = [ nose ];
+  build-system = [ setuptools ];
 
-  checkPhase = ''
-    nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     homepage = "https://github.com/kxxoling/PTable";
diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix
index 11f331cd67929..c0f0d87477ff5 100644
--- a/pkgs/development/python-modules/publicsuffix/default.nix
+++ b/pkgs/development/python-modules/publicsuffix/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Allows to get the public suffix of a domain name";
     homepage = "https://pypi.python.org/pypi/publicsuffix/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix
index 02a686c31025b..c11880a620c36 100644
--- a/pkgs/development/python-modules/publicsuffix2/default.nix
+++ b/pkgs/development/python-modules/publicsuffix2/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage {
     description = "Get a public suffix for a domain name using the Public Suffix List";
     homepage = "https://github.com/nexB/python-publicsuffix2";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
index e102e706a178f..08abae48d113c 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/inducer/pudb";
     changelog = "https://github.com/inducer/pudb/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix
index eb91a1aa59182..c71fac21c530e 100644
--- a/pkgs/development/python-modules/pulumi-aws/default.nix
+++ b/pkgs/development/python-modules/pulumi-aws/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pulumi/pulumi-aws";
     changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix
index 5851e3e274390..d037fc7af5b85 100644
--- a/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/pkgs/development/python-modules/pure-pcapy3/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Reimplementation of pcapy";
     homepage = "https://github.com/rcloran/pure-pcapy-3";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix
index d6e76fcc1ba78..493ac2fd2960e 100644
--- a/pkgs/development/python-modules/purl/default.nix
+++ b/pkgs/development/python-modules/purl/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Immutable URL class for easy URL-building and manipulation";
     homepage = "https://github.com/codeinthehole/purl";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/py-ccm15/default.nix b/pkgs/development/python-modules/py-ccm15/default.nix
new file mode 100644
index 0000000000000..aa4ccf9928e2e
--- /dev/null
+++ b/pkgs/development/python-modules/py-ccm15/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  httpx,
+  xmltodict,
+  aiohttp,
+}:
+
+buildPythonPackage {
+  pname = "py-ccm15";
+  version = "0.0.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ocalvo";
+    repo = "py-ccm15";
+    # Upstream does not have a tag for this release and this is the exact release commit
+    # Therefore it should not be marked unstable
+    # upstream issue: https://github.com/ocalvo/py-ccm15/issues/10
+    rev = "3891d840e69d241c85bf9486e7fe0bb3c7443980";
+    hash = "sha256-I2/AdG07PAvuC8rQKOIAUk7u3pJpANMaFpvEsejWeBU=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    httpx
+    xmltodict
+    aiohttp
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "ccm15" ];
+
+  meta = {
+    description = "Python Library to access a Midea CCM15 data converter";
+    homepage = "https://github.com/ocalvo/py-ccm15";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index 7c26fe29f2f2f..cf734872942d9 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/workhorsy/py-cpuinfo";
     changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix
index 2e2f1dd1bb16d..6ee5b05346739 100644
--- a/pkgs/development/python-modules/py-ecc/default.nix
+++ b/pkgs/development/python-modules/py-ecc/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "ECC pairing and bn_128 and bls12_381 curve operations";
     homepage = "https://github.com/ethereum/py_ecc";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
index 6c009fd9c5922..bf95fb2da73f8 100644
--- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix
+++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     description = "Collection of functions to generate hashes for signing on Ethereum";
     homepage = "https://github.com/rmeissner/py-eth-sig-utils";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more.
     broken = true;
   };
diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index e81173c5cae00..143a3159b8fe7 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -1,10 +1,9 @@
 {
   lib,
   aiohttp,
-  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -24,17 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-46KoOKBiulTYH2x8ftFPVDF0oeBG1Pe9PkonxIV7528=";
   };
 
-  nativeBuildInputs = [
-    poetry-core
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    aiohttp
-    async-timeout
-  ];
+  dependencies = [ aiohttp ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "synology_dsm" ];
 
diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix
index 5a546643e17e9..aed03b8408732 100644
--- a/pkgs/development/python-modules/py-vapid/default.nix
+++ b/pkgs/development/python-modules/py-vapid/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "vapid";
     homepage = "https://github.com/mozilla-services/vapid";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index d21e806016210..d762008e2ff24 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ultrabug/py3status";
     changelog = "https://github.com/ultrabug/py3status/blob/${version}/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix
index 24dc34c47f533..30211f9b6fd36 100644
--- a/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/pkgs/development/python-modules/pyacoustid/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Bindings for Chromaprint acoustic fingerprinting";
     homepage = "https://github.com/sampsyo/pyacoustid";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index 2cbeb25693b95..9749114a4090f 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -11,19 +11,19 @@
 
 buildPythonPackage rec {
   pname = "pyais";
-  version = "2.6.6";
+  version = "2.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "M0r13n";
     repo = "pyais";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8i852bf0FRaorI3vJnuHTZSik6yoqtHr3wbafSvKmBM=";
+    hash = "sha256-6Bv0YE2zQv0mdXNzHkhq4sOJ18nmyxO884Smzwn2c8I=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   dependencies = [
     attrs
diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix
index 1fdad3647bd0c..e0a983c6bbc55 100644
--- a/pkgs/development/python-modules/pyamg/default.nix
+++ b/pkgs/development/python-modules/pyamg/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyamg/pyamg";
     changelog = "https://github.com/pyamg/pyamg/blob/v${version}/changelog.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix
index 56096db576e89..9b5b394893135 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/pkgs/development/python-modules/pyaml/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     mainProgram = "pyaml";
     homepage = "https://github.com/mk-fg/pretty-yaml";
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix
index ced51705b96a6..6c81a3f081b8f 100644
--- a/pkgs/development/python-modules/pyannotate/default.nix
+++ b/pkgs/development/python-modules/pyannotate/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     mainProgram = "pyannotate";
     homepage = "https://github.com/dropbox/pyannotate";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 9f4510785b0f8..7507b56528e0a 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -83,6 +83,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyannote/pyannote-audio";
     changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix
index 85c01bcee578f..d9ce9b18db99d 100644
--- a/pkgs/development/python-modules/pyannote-core/default.nix
+++ b/pkgs/development/python-modules/pyannote-core/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyannote/pyannote-core";
     changelog = "https://github.com/pyannote/pyannote-core/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix
index 314cc5110cf15..e8455f4d19b6c 100644
--- a/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/pkgs/development/python-modules/pyannote-metrics/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyannote/pyannote-metrics";
     changelog = "http://pyannote.github.io/pyannote-metrics/changelog.html";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pyannote-metrics";
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix
index 0b85c50474d58..a92c56758e2fb 100644
--- a/pkgs/development/python-modules/pyannote-pipeline/default.nix
+++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     description = "Tunable pipelines";
     homepage = "https://github.com/pyannote/pyannote-pipeline";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pyannote-pipeline";
   };
 }
diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix
index bbceb87e16f47..4c9f519fe28a7 100644
--- a/pkgs/development/python-modules/pyasn1/default.nix
+++ b/pkgs/development/python-modules/pyasn1/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://pyasn1.readthedocs.io";
     changelog = "https://github.com/etingof/pyasn1/blob/master/CHANGES.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyasuswrt/default.nix b/pkgs/development/python-modules/pyasuswrt/default.nix
index 85449618a7e46..33bcc5ef39a10 100644
--- a/pkgs/development/python-modules/pyasuswrt/default.nix
+++ b/pkgs/development/python-modules/pyasuswrt/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ollo69/pyasuswrt";
     changelog = "https://github.com/ollo69/pyasuswrt/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyasyncore/default.nix b/pkgs/development/python-modules/pyasyncore/default.nix
index 22f1098ee4836..602b90ae41260 100644
--- a/pkgs/development/python-modules/pyasyncore/default.nix
+++ b/pkgs/development/python-modules/pyasyncore/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Make asyncore available for Python 3.12 onwards";
     homepage = "https://github.com/simonrob/pyasyncore";
     license = licenses.psfl;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index 71c2d380d4755..adc1a20936088 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/laughingman7743/PyAthena/";
     changelog = "https://github.com/laughingman7743/PyAthena/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix
index 77a4b8249d074..9d76a23bc780f 100644
--- a/pkgs/development/python-modules/pyatmo/default.nix
+++ b/pkgs/development/python-modules/pyatmo/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jabesq/pyatmo";
     changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix
index cb2122eaaba32..6e4a7e846b3ec 100644
--- a/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       mit
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 50b7bcbd26441..6972373eea32b 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mayeut/pybase64";
     changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index cdb7753119bf6..3d150e82a501f 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -69,7 +69,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/bids-standard/pybids";
     changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pybids";
   };
 }
diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix
index e6742c5e3654d..d5783fa023124 100644
--- a/pkgs/development/python-modules/pybrowserid/default.nix
+++ b/pkgs/development/python-modules/pybrowserid/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Python library for the BrowserID Protocol";
     homepage = "https://github.com/mozilla/PyBrowserID";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix
index 8d34b1f39e3c7..5276e951b3c7c 100644
--- a/pkgs/development/python-modules/pycapnp/default.nix
+++ b/pkgs/development/python-modules/pycapnp/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://capnproto.github.io/pycapnp/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd2;
     # No support for capnproto 1.0 yet
     # https://github.com/capnproto/pycapnp/issues/323
diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix
index 4bc528b64f95f..5509173bd985f 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/pkgs/development/python-modules/pyct/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyviz/pyct";
     changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 38d46c58e7b13..689e23e3c1aef 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -89,6 +89,6 @@ buildPythonPackage rec {
       lgpl2Only
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix
index 6a9cfaaeb29f5..39da53345e860 100644
--- a/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Extra Pydantic types";
     homepage = "https://github.com/pydantic/pydantic-extra-types";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix
index 2d158699724a9..ed94f3da47803 100644
--- a/pkgs/development/python-modules/pydantic-settings/default.nix
+++ b/pkgs/development/python-modules/pydantic-settings/default.nix
@@ -62,7 +62,7 @@ let
       homepage = "https://github.com/pydantic/pydantic-settings";
       license = licenses.mit;
       broken = lib.versionOlder pydantic.version "2.0.0";
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
index 3bfb1d4ae8c6e..1cd06c0d2be61 100644
--- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pydata/pydata-sphinx-theme";
     changelog = "https://github.com/pydata/pydata-sphinx-theme/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix
index aedc5d852ff04..780f01cec123c 100644
--- a/pkgs/development/python-modules/pydbus/default.nix
+++ b/pkgs/development/python-modules/pydbus/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/LEW21/pydbus";
     description = "Pythonic DBus library";
     license = lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix
index 6139d6b897189..d074f0a5feaeb 100644
--- a/pkgs/development/python-modules/pydocumentdb/default.nix
+++ b/pkgs/development/python-modules/pydocumentdb/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Azure Cosmos DB API";
     homepage = "https://github.com/Azure/azure-cosmos-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix
index 3a5fcb066ccc5..31f40e7750ff3 100644
--- a/pkgs/development/python-modules/pydot/default.nix
+++ b/pkgs/development/python-modules/pydot/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     description = "Allows to create both directed and non directed graphs from Python";
     homepage = "https://github.com/erocarrera/pydot";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index e9fa5c8f70632..2678412b23449 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "http://pydub.com";
     changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix
index 93244293adab6..0bd4fdc27b795 100644
--- a/pkgs/development/python-modules/pyexcel-io/default.nix
+++ b/pkgs/development/python-modules/pyexcel-io/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
     homepage = "http://docs.pyexcel.org/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix
index 646bd2e8adc7a..e7683a259fd3f 100644
--- a/pkgs/development/python-modules/pyexcel-ods/default.nix
+++ b/pkgs/development/python-modules/pyexcel-ods/default.nix
@@ -1,43 +1,58 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  fetchpatch2,
   pyexcel-io,
   odfpy,
-  nose,
   pyexcel,
   pyexcel-xls,
   psutil,
+  pytestCheckHook,
+  pytest-cov,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyexcel-ods";
   version = "0.6.0";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f61b56515fd4ccd4687f0a112422f74ce8535247ad2da49db90038d7e3ed397c";
+  src = fetchFromGitHub {
+    owner = "pyexcel";
+    repo = "pyexcel-ods";
+    rev = "v${version}";
+    hash = "sha256-wptjCSi56hotmiIE0TrLY7jsCHKwDR+a7d89sAQWBHg=";
   };
 
-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/pyexcel/pyexcel-ods/pull/45
+    (fetchpatch2 {
+      name = "nose-to-pytest.patch";
+      url = "https://github.com/pyexcel/pyexcel-ods/compare/661d4f0b484ed281128c72e1a2701e2d33fc1879...838b410e800a86c147644568aaa8b2c005d13491.patch";
+      hash = "sha256-1a52VM8yGDEjSFXTq3Di74xwv10d/QskpctOnz9zW1w=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     pyexcel-io
     odfpy
   ];
 
   nativeCheckInputs = [
-    nose
+    pytestCheckHook
+    pytest-cov
     pyexcel
     pyexcel-xls
     psutil
   ];
 
-  checkPhase = "nosetests";
-
   meta = {
     description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
     homepage = "http://docs.pyexcel.org/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index 5ff87b2390eb7..c372ca08adf12 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -1,47 +1,61 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  fetchpatch2,
   pyexcel-io,
   xlrd,
   xlwt,
-  nose,
   pyexcel,
-  mock,
+  pytestCheckHook,
+  pytest-cov,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyexcel-xls";
   version = "0.7.0";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5ec606ef8667aafbb0c3fbd8242a7c23bf175ee7c10b08f70799b84fb2db84cb";
+  src = fetchFromGitHub {
+    owner = "pyexcel";
+    repo = "pyexcel-xls";
+    rev = "v${version}";
+    hash = "sha256-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg=";
   };
 
-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/pyexcel/pyexcel-xls/pull/54
+    (fetchpatch2 {
+      name = "nose-to-pytest.patch";
+      url = "https://github.com/pyexcel/pyexcel-xls/compare/d8953c8ff7dc9a4a3465f2cfc182acafa49f6ea2...9f0d48035114f73077dd0f109395af32b4d9d48b.patch";
+      hash = "sha256-2kVdN+kEYaJjXGzv9eudfKjRweMG0grTd5wnZXIDzUU=";
+      excludes = [ ".github/*" ];
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     pyexcel-io
     xlrd
     xlwt
   ];
 
   nativeCheckInputs = [
-    nose
+    pytestCheckHook
     pyexcel
-    mock
+    pytest-cov
   ];
 
   postPatch = ''
     substituteInPlace setup.py --replace "xlrd<2" "xlrd<3"
   '';
 
-  checkPhase = "nosetests --exclude test_issue_151";
-
   meta = {
     description = "Wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
     homepage = "http://docs.pyexcel.org/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
index 439164698590e..404f29068affa 100644
--- a/pkgs/development/python-modules/pyexcel/default.nix
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
     homepage = "http://docs.pyexcel.org/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix
index b661edcc895d7..ab6444efebaad 100644
--- a/pkgs/development/python-modules/pyfma/default.nix
+++ b/pkgs/development/python-modules/pyfma/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Fused multiply-add for Python";
     homepage = "https://github.com/nschloe/pyfma";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
index 81cc96051c257..efe1c179777b9 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/giampaolo/pyftpdlib/";
     changelog = "https://github.com/giampaolo/pyftpdlib/blob/release-${version}/HISTORY.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ftpbench";
   };
 }
diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix
index 3332c711bfb3e..5f5ba161f5e78 100644
--- a/pkgs/development/python-modules/pyfxa/default.nix
+++ b/pkgs/development/python-modules/pyfxa/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     mainProgram = "fxa-client";
     homepage = "https://github.com/mozilla/PyFxA";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix
index bed6aabe4057c..c16eae5e8e513 100644
--- a/pkgs/development/python-modules/pygal/default.nix
+++ b/pkgs/development/python-modules/pygal/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     mainProgram = "pygal_gen.py";
     homepage = "http://www.pygal.org";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index c541fe5aac650..eeb799f32919d 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/libgit2/pygit2";
     changelog = "https://github.com/libgit2/pygit2/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix
index caef1f11eb354..117d6a7b03bb7 100644
--- a/pkgs/development/python-modules/pygnmi/default.nix
+++ b/pkgs/development/python-modules/pygnmi/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/akarneliuk/pygnmi";
     changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix
index 76eb40701cee1..a39bc08458ab6 100644
--- a/pkgs/development/python-modules/pygpgme/default.nix
+++ b/pkgs/development/python-modules/pygpgme/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://launchpad.net/pygpgme";
     description = "Python wrapper for the GPGME library";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix
index eb7f5491496d5..f392f53a8c1a5 100644
--- a/pkgs/development/python-modules/pygtkspellcheck/default.nix
+++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/koehlma/pygtkspellcheck";
     description = "Python spell-checking library for GtkTextViews based on Enchant";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix
index 2a1cad706bbe4..dc6b6e1ea5aff 100644
--- a/pkgs/development/python-modules/pyheif/default.nix
+++ b/pkgs/development/python-modules/pyheif/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/carsales/pyheif";
     description = "Python interface to libheif library";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index 8a0c51eef3dc4..f941b8dc67c16 100644
--- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     mainProgram = "create-version-file";
     homepage = "https://pypi.org/project/pyinstaller-versionfile/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
index 417601c034ddf..5e084b0e33168 100644
--- a/pkgs/development/python-modules/pykeepass/default.nix
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pykeepass";
-  version = "4.1.0";
+  version = "4.1.0-post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "libkeepass";
     repo = "pykeepass";
-    rev = "v${version}";
-    hash = "sha256-33bpkj2ADpxSqiTOVcawE5aJdqWHfcY9WrlQJdg3vHY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-CsVwjv+9v+yzjywq9bppma+kkrlsXlvU8TsKmq466II=";
   };
 
   build-system = [ setuptools ];
@@ -30,7 +30,6 @@ buildPythonPackage rec {
     construct
     lxml
     pycryptodomex
-    setuptools
   ];
 
   propagatedNativeBuildInputs = [ argon2-cffi ];
diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix
index 19cc38aba586c..1768d04891513 100644
--- a/pkgs/development/python-modules/pykka/default.nix
+++ b/pkgs/development/python-modules/pykka/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     homepage = "https://www.pykka.org/";
     description = "Python implementation of the actor model";
     changelog = "https://github.com/jodal/pykka/releases/tag/v${version}";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix
index 4f5a3cbeb846f..1442821ff216d 100644
--- a/pkgs/development/python-modules/pylibjpeg/default.nix
+++ b/pkgs/development/python-modules/pylibjpeg/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylibjpeg";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "pydicom";
     repo = "pylibjpeg";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qGtrphsBBVieGS/8rdymbsjLMU/QEd7zFNAANN8bD+k=";
+    hash = "sha256-MA1A/hTIx95MYZ2LGOifnHn77wbv0ydAgQSzNZRykVg=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index cb3d7d5902d22..e5730dfeb6144 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Quick and small memcached client for Python";
     homepage = "http://sendapatch.se/projects/pylibmc/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 83fa6de45c75a..eb96516e84e47 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -120,7 +120,7 @@ buildPythonPackage rec {
       - epylint: Emacs and Flymake compatible Pylint
     '';
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pylint";
   };
 }
diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix
index e86ddcc60338d..de2cbdae88b8d 100644
--- a/pkgs/development/python-modules/pyls-spyder/default.nix
+++ b/pkgs/development/python-modules/pyls-spyder/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Spyder extensions for the python-language-server";
     homepage = "https://github.com/spyder-ide/pyls-spyder";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix
index 048822ad976e1..78c3cba291c48 100644
--- a/pkgs/development/python-modules/pylxd/default.nix
+++ b/pkgs/development/python-modules/pylxd/default.nix
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     homepage = "https://pylxd.readthedocs.io/";
     changelog = "https://github.com/canonical/pylxd/releases/tag/${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pylyrics/default.nix b/pkgs/development/python-modules/pylyrics/default.nix
index 29949d8c088ad..189b9d184db0b 100644
--- a/pkgs/development/python-modules/pylyrics/default.nix
+++ b/pkgs/development/python-modules/pylyrics/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs";
     homepage = "https://github.com/geekpradd/PyLyrics";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix
index a5d2063c2b6b2..bc5292e6d15e3 100644
--- a/pkgs/development/python-modules/pymbolic/default.nix
+++ b/pkgs/development/python-modules/pymbolic/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Package for symbolic computation";
     homepage = "https://documen.tician.de/pymbolic/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index f60c8ed5fcfd0..016b5ee6bf242 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sbraz/pymediainfo";
     changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix
index 0f504b00cd75d..d7e1b35ed742c 100644
--- a/pkgs/development/python-modules/pymongo/default.nix
+++ b/pkgs/development/python-modules/pymongo/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Python driver for MongoDB";
     homepage = "https://github.com/mongodb/mongo-python-driver";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymorphy2/default.nix b/pkgs/development/python-modules/pymorphy2/default.nix
index ee9e7daa80c3d..748f7d8d24a39 100644
--- a/pkgs/development/python-modules/pymorphy2/default.nix
+++ b/pkgs/development/python-modules/pymorphy2/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "pymorphy";
     homepage = "https://github.com/kmike/pymorphy2";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/pkgs/development/python-modules/pymorphy2/dicts-ru.nix
index fd9f2c5e7e878..4385990518762 100644
--- a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix
+++ b/pkgs/development/python-modules/pymorphy2/dicts-ru.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     description = "Russian dictionaries for pymorphy2";
     homepage = "https://github.com/kmike/pymorphy2-dicts/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index 765b881542376..cc610d62e388f 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Python binding to the Networking and Cryptography (NaCl) library";
     homepage = "https://github.com/pyca/pynacl/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix
index e7d6803b288e8..cd556861748c1 100644
--- a/pkgs/development/python-modules/pynamodb/default.nix
+++ b/pkgs/development/python-modules/pynamodb/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "http://jlafon.io/pynamodb.html";
     changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index f91ae1753966a..f21872914ba66 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     homepage = "http://www.pyomo.org/";
     changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pyomo";
   };
 }
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index fc7dbfd515f34..b9691b2a2827d 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -100,6 +100,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyca/pyopenssl";
     changelog = "https://github.com/pyca/pyopenssl/blob/${version}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix
index 5eab5062ac882..5c752a0834d17 100644
--- a/pkgs/development/python-modules/pyperf/default.nix
+++ b/pkgs/development/python-modules/pyperf/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://pyperf.readthedocs.io/";
     changelog = "https://github.com/psf/pyperf/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix
index cf792a4226d9f..b01f7573511f1 100644
--- a/pkgs/development/python-modules/pypresence/default.nix
+++ b/pkgs/development/python-modules/pypresence/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     homepage = "https://qwertyquerty.github.io/pypresence/html/index.html";
     description = "Discord RPC client written in Python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix
index ec8367aee0f49..9506f4c242187 100644
--- a/pkgs/development/python-modules/pyprind/default.nix
+++ b/pkgs/development/python-modules/pyprind/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Python Progress Bar and Percent Indicator Utility";
     homepage = "https://github.com/rasbt/pyprind";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix
index 09eb72384c1ab..160e13b48db0e 100644
--- a/pkgs/development/python-modules/pyproject-api/default.nix
+++ b/pkgs/development/python-modules/pyproject-api/default.nix
@@ -77,6 +77,6 @@ buildPythonPackage rec {
     description = "API to interact with the python pyproject.toml based projects";
     homepage = "https://github.com/tox-dev/pyproject-api";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid-mako/default.nix b/pkgs/development/python-modules/pyramid-mako/default.nix
index 2b4483d04f1d6..f362fae175173 100644
--- a/pkgs/development/python-modules/pyramid-mako/default.nix
+++ b/pkgs/development/python-modules/pyramid-mako/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Pylons/pyramid_mako";
     description = "Mako template bindings for the Pyramid web framework";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyramid-multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix
index 6454fa6c33c27..2bf668f94e357 100644
--- a/pkgs/development/python-modules/pyramid-multiauth/default.nix
+++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies";
     homepage = "https://github.com/mozilla-services/pyramid_multiauth";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 957394ad5fa3c..51ed8f0cc31f9 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -96,6 +96,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/IdentityPython/pysaml2";
     changelog = "https://github.com/IdentityPython/pysaml2/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index 3ee18d12e4de7..667ba03903230 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage {
     homepage = "https://github.com/deepmind/pysc2";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix
index a724b105ed2b6..c85e01e099252 100644
--- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix
+++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     description = "Integration of django builtin scaffold cli (django-admin) into PyScaffold";
     homepage = "https://pypi.org/project/pyscaffoldext-django/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix
index 768cd31704180..6112062c91e9b 100644
--- a/pkgs/development/python-modules/pyscreenshot/default.nix
+++ b/pkgs/development/python-modules/pyscreenshot/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "python screenshot";
     homepage = "https://github.com/ponty/pyscreenshot";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix
index 46261614492b5..af8307218eaf6 100644
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Scss compiler for Python";
     homepage = "https://pyscss.readthedocs.org/en/latest/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix
index 236d040cb9459..48cc85cf27b03 100644
--- a/pkgs/development/python-modules/pysendfile/default.nix
+++ b/pkgs/development/python-modules/pysendfile/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/giampaolo/pysendfile";
     changelog = "https://github.com/giampaolo/pysendfile/blob/release-${version}/HISTORY.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix
index 68c318a9d975c..bd48ff1b4527e 100644
--- a/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Asyncio extension package for pyserial";
     homepage = "https://github.com/pyserial/pyserial-asyncio";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 3999af3f3e63a..ba92fdaebd281 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -73,6 +73,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/KimiNewt/pyshark/";
     changelog = "https://github.com/KimiNewt/pyshark/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix
index 34866cdf85a29..176e04eed522d 100644
--- a/pkgs/development/python-modules/pyshp/default.nix
+++ b/pkgs/development/python-modules/pyshp/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Python read/write support for ESRI Shapefile format";
     homepage = "https://github.com/GeospatialPython/pyshp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmartdl/default.nix b/pkgs/development/python-modules/pysmartdl/default.nix
index d8920c500f93e..b131b2e3e1965 100644
--- a/pkgs/development/python-modules/pysmartdl/default.nix
+++ b/pkgs/development/python-modules/pysmartdl/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Smart Download Manager for Python";
     changelog = "https://github.com/iTaybb/pySmartDL/blob/${src.rev}/ChangeLog.txt";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysnmpcrypto/default.nix b/pkgs/development/python-modules/pysnmpcrypto/default.nix
index 4261815d5741b..73e3ed2e17b35 100644
--- a/pkgs/development/python-modules/pysnmpcrypto/default.nix
+++ b/pkgs/development/python-modules/pysnmpcrypto/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/etingof/pysnmpcrypto";
     changelog = "https://github.com/etingof/pysnmpcrypto/blob/${version}/CHANGES.txt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix
index a1201c22c21fe..3b371ba727cff 100644
--- a/pkgs/development/python-modules/pysqlcipher3/default.nix
+++ b/pkgs/development/python-modules/pysqlcipher3/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Python 3 bindings for SQLCipher";
     homepage = "https://github.com/rigglemania/pysqlcipher3/";
     license = licenses.zlib;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix
index 8541a95c8c6f8..f9f4e9c59def1 100644
--- a/pkgs/development/python-modules/pysrim/default.nix
+++ b/pkgs/development/python-modules/pysrim/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Srim Automation of Tasks via Python";
     homepage = "https://gitlab.com/costrouc/pysrim";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index 9088f2c503aff..f82f6c8e4ac2f 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Framework-agnostic, logic-free templating system inspired by ctemplate and et";
     homepage = "https://github.com/defunkt/pystache";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix
index c833f155c9342..71fbf56b77c23 100644
--- a/pkgs/development/python-modules/pysubs2/default.nix
+++ b/pkgs/development/python-modules/pysubs2/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Python library for editing subtitle files";
     mainProgram = "pysubs2";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix
index e82ff9c57e4e2..13e41ed77a5e0 100644
--- a/pkgs/development/python-modules/pytado/default.nix
+++ b/pkgs/development/python-modules/pytado/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/wmalgadey/PyTado";
     changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index ac5a88e436912..23a26fd52a1b9 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     license = licenses.asl20;
     description = "Python wrapper for Google Tesseract";
     mainProgram = "pytesseract";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix
index 0064ba62fc712..31ed87e032138 100644
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Generate PyAnnotate annotations from your pytest tests";
     homepage = "https://github.com/kensho-technologies/pytest-annotate";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
index a95648618f38f..5832ff98e668d 100644
--- a/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-ansible";
-  version = "24.1.3";
+  version = "24.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "ansible";
     repo = "pytest-ansible";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pQNm7Q9NAc/jLlR6f0132tpXyBoQaKpm7JoEgqOJL8U=";
+    hash = "sha256-yrdfVWXcTB6WKDUnm4wDdKZGWq9F7oOT0RP42xyASRw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix
index 6de1445b7da7f..4a1912e958782 100644
--- a/pkgs/development/python-modules/pytest-arraydiff/default.nix
+++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Pytest plugin to help with comparing array output from tests";
     homepage = "https://github.com/astrofrog/pytest-arraydiff";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix
index b2771d70c495b..f620e14a51b6c 100644
--- a/pkgs/development/python-modules/pytest-astropy/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     description = "Meta-package containing dependencies for testing";
     homepage = "https://astropy.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix
index 5e07b68d989cd..f46abe031c3f3 100644
--- a/pkgs/development/python-modules/pytest-black/default.nix
+++ b/pkgs/development/python-modules/pytest-black/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Pytest plugin to enable format checking with black";
     homepage = "https://github.com/shopkeep/pytest-black";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix
index 8c12563a5be26..2a970b16e7e02 100644
--- a/pkgs/development/python-modules/pytest-click/default.nix
+++ b/pkgs/development/python-modules/pytest-click/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Stranger6667/pytest-click";
     changelog = "https://github.com/Stranger6667/pytest-click/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix
index d60948e7d924e..2d98d9cfb2806 100644
--- a/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/pkgs/development/python-modules/pytest-datafiles/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Pytest plugin to create a tmpdir containing predefined files/directories";
     homepage = "https://github.com/omarkohl/pytest-datafiles";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix
index 3a57ab7db41c3..64aae4d60ad20 100644
--- a/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     description = "Pytest plugin with advanced doctest features";
     homepage = "https://astropy.org";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
index 5196a6e8f1086..9908c3b2b4ff5 100644
--- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
+++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/astropy/pytest-filter-subpackage";
     changelog = "https://github.com/astropy/pytest-filter-subpackage/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index be1cc3523ccc0..f45abf0941fa7 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-flake8";
-  version = "1.2.0";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "coherent-oss";
     repo = "pytest-flake8";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VNefGRB++FZFIGOS8Pyxbfe0zAXqwy+p6uERE70+CT4=";
+    hash = "sha256-FsJysBj5S5HHGay+YZKMgb9RdUN637J+FfNl+m9l6ik=";
   };
 
   build-system = [ setuptools-scm ];
@@ -28,21 +28,9 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # https://github.com/coherent-oss/pytest-flake8/issues/2
-    "test_version"
-    "test_default_flake8_ignores"
-    "test_ignores_all"
-    "test_w293w292"
-    "test_mtime_caching"
-    "test_ok_verbose"
-    "test_keyword_match"
-    "test_run_on_init_file"
-    "test_unicode_error"
-    "test_junit_classname"
-  ];
-
   meta = {
+    # https://github.com/coherent-oss/pytest-flake8/issues/3
+    broken = lib.versionAtLeast flake8.version "6";
     changelog = "https://github.com/coherent-oss/pytest-flake8/blob/${src.rev}/NEWS.rst";
     description = "py.test plugin for efficiently checking PEP8 compliance";
     homepage = "https://github.com/coherent-oss/pytest-flake8";
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 8d7f98c78ffe8..891b8ed2cb751 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kevin1024/pytest-httpbin";
     changelog = "https://github.com/kevin1024/pytest-httpbin/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix
index 8462f1565ef97..e4d5d98c406e7 100644
--- a/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/pkgs/development/python-modules/pytest-isort/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/moccu/pytest-isort/";
     changelog = "https://github.com/stephrdev/pytest-isort/blob/${version}/CHANGELOG.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix
index c36bcf52e6e0f..36e45343a3082 100644
--- a/pkgs/development/python-modules/pytest-jupyter/default.nix
+++ b/pkgs/development/python-modules/pytest-jupyter/default.nix
@@ -72,7 +72,7 @@ let
       description = "pytest plugin for testing Jupyter core libraries and extensions";
       homepage = "https://github.com/jupyter-server/pytest-jupyter";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
index 3205d9d0e82d3..236e6dad3bfe7 100644
--- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Allows you to use fixtures in @pytest.mark.parametrize";
     homepage = "https://github.com/dev-petrov/pytest-lazy-fixtures";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix
index 214863978df0c..7a9903def54cb 100644
--- a/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Pytest plugin to check source code with pylint";
     homepage = "https://github.com/carsongee/pytest-pylint";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix
index 6e468060c6b79..d418cfee9e1f3 100644
--- a/pkgs/development/python-modules/pytest-qt/default.nix
+++ b/pkgs/development/python-modules/pytest-qt/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "pytest support for PyQt and PySide applications";
     homepage = "https://github.com/pytest-dev/pytest-qt";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix
index a86aceae8ddc7..6eecdcbc958b2 100644
--- a/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/pkgs/development/python-modules/pytest-relaxed/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Relaxed test discovery/organization for pytest";
     changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix
index 43778bfab64e1..25cf16b2a6e6a 100644
--- a/pkgs/development/python-modules/pytest-remotedata/default.nix
+++ b/pkgs/development/python-modules/pytest-remotedata/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/astropy/pytest-remotedata";
     changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix
index 34c4ab2cce2c1..8df24c2be1f87 100644
--- a/pkgs/development/python-modules/pytest-repeat/default.nix
+++ b/pkgs/development/python-modules/pytest-repeat/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pytest-dev/pytest-repeat";
     changelog = "https://github.com/pytest-dev/pytest-repeat/blob/v${version}/CHANGES.rst";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index 11f67121f4f74..bc66d607c775c 100644
--- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Extensible server fixures for py.test";
     homepage = "https://github.com/manahl/pytest-plugins";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix
index aafe4b5b93ec8..8d1f70fc8070c 100644
--- a/pkgs/development/python-modules/pytest-snapshot/default.nix
+++ b/pkgs/development/python-modules/pytest-snapshot/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Plugin to enable snapshot testing with pytest";
     homepage = "https://github.com/joseph-roitman/pytest-snapshot/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix
index 7e34ef0a99b94..6dc518f1182e6 100644
--- a/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/pkgs/development/python-modules/pytest-socket/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/miketheman/pytest-socket";
     changelog = "https://github.com/miketheman/pytest-socket/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix
index b90b2a30e5ca0..ac77a4ac27f14 100644
--- a/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/pkgs/development/python-modules/pytest-sugar/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Frozenball/pytest-sugar";
     changelog = "https://github.com/Teemu/pytest-sugar/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix
index b35b412c71cc5..43464e3ce149a 100644
--- a/pkgs/development/python-modules/pytest-tornasync/default.nix
+++ b/pkgs/development/python-modules/pytest-tornasync/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "py.test plugin for testing Python 3.5+ Tornado code";
     homepage = "https://github.com/eukaryote/pytest-tornasync";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix
index efe696a270d83..a27712212d30f 100644
--- a/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/pkgs/development/python-modules/pytest-xprocess/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Pytest external process plugin";
     homepage = "https://github.com/pytest-dev";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix
index b011f081b984d..0923c9b98bcea 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/pkgs/development/python-modules/pytest-xvfb/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/The-Compiler/pytest-xvfb";
     changelog = "https://github.com/The-Compiler/pytest-xvfb/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix
index cefe9412e86e9..7188c83816053 100644
--- a/pkgs/development/python-modules/python-barbicanclient/default.nix
+++ b/pkgs/development/python-modules/python-barbicanclient/default.nix
@@ -4,6 +4,7 @@
   cliff,
   fetchFromGitea,
   keystoneauth1,
+  openstackdocstheme,
   oslo-i18n,
   oslo-serialization,
   oslo-utils,
@@ -12,6 +13,8 @@
   requests-mock,
   requests,
   setuptools,
+  sphinxcontrib-apidoc,
+  sphinxHook,
   stestr,
 }:
 
@@ -32,11 +35,22 @@ buildPythonPackage rec {
 
   env.PBR_VERSION = version;
 
+  postPatch = ''
+    # Disable rsvgconverter not needed to build manpage
+    substituteInPlace doc/source/conf.py \
+      --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter',"
+  '';
+
   build-system = [
+    openstackdocstheme
     pbr
     setuptools
+    sphinxHook
+    sphinxcontrib-apidoc
   ];
 
+  sphinxBuilders = [ "man" ];
+
   dependencies = [
     cliff
     keystoneauth1
@@ -65,6 +79,7 @@ buildPythonPackage rec {
     homepage = "https://opendev.org/openstack/python-barbicanclient";
     description = "Client library for OpenStack Barbican API";
     license = lib.licenses.asl20;
+    mainProgram = "barbican";
     maintainers = lib.teams.openstack.members;
   };
 }
diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix
index 63f8575ff2d00..2adf0060dfb69 100644
--- a/pkgs/development/python-modules/python-daemon/default.nix
+++ b/pkgs/development/python-modules/python-daemon/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
       gpl3Plus
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix
index 20cbf04e6ba2e..fa2a61d85aa43 100644
--- a/pkgs/development/python-modules/python-designateclient/default.nix
+++ b/pkgs/development/python-modules/python-designateclient/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitea,
   jsonschema,
   keystoneauth1,
+  openstackdocstheme,
   osc-lib,
   oslo-serialization,
   oslo-utils,
@@ -14,6 +15,8 @@
   requests-mock,
   requests,
   setuptools,
+  sphinxHook,
+  sphinxcontrib-apidoc,
   stestr,
 }:
 
@@ -35,10 +38,15 @@ buildPythonPackage rec {
   env.PBR_VERSION = version;
 
   build-system = [
+    openstackdocstheme
     pbr
     setuptools
+    sphinxHook
+    sphinxcontrib-apidoc
   ];
 
+  sphinxBuilders = [ "man" ];
+
   dependencies = [
     debtcollector
     jsonschema
diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix
index b9dcd8aaee394..05fe0b86069da 100644
--- a/pkgs/development/python-modules/python-etcd/default.nix
+++ b/pkgs/development/python-modules/python-etcd/default.nix
@@ -1,41 +1,48 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  nose,
-  mock,
-  pyopenssl,
+  fetchFromGitHub,
+  setuptools,
   urllib3,
   dnspython,
+  pytestCheckHook,
+  etcd_3_4,
+  mock,
+  pyopenssl,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "python-etcd";
-  version = "0.4.5";
-  format = "setuptools";
+  version = "0.5.0-unstable-2023-10-31";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f1b5ebb825a3e8190494f5ce1509fde9069f2754838ed90402a8c11e1f52b8cb";
+  src = fetchFromGitHub {
+    owner = "jplana";
+    repo = "python-etcd";
+    rev = "5aea0fd4461bd05dd96e4ad637f6be7bceb1cee5";
+    hash = "sha256-eVirStLOPTbf860jfkNMWtGf+r0VygLZRjRDjBMCVKg=";
   };
 
-  buildInputs = [
-    nose
-    mock
-    pyopenssl
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     urllib3
     dnspython
   ];
 
-  postPatch = ''
-    sed -i '19s/dns/"dnspython"/' setup.py
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    etcd_3_4
+    mock
+    pyopenssl
+  ];
 
-  # Some issues with etcd not in path even though most tests passed
-  doCheck = false;
+  preCheck = ''
+    for file in "test_auth" "integration/test_simple"; do
+      substituteInPlace src/etcd/tests/$file.py \
+        --replace-fail "assertEquals" "assertEqual"
+    done
+  '';
 
   meta = with lib; {
     description = "Python client for Etcd";
diff --git a/pkgs/development/python-modules/python-fedora/default.nix b/pkgs/development/python-modules/python-fedora/default.nix
index 91f53f56d856f..4dda6c0bc84d8 100644
--- a/pkgs/development/python-modules/python-fedora/default.nix
+++ b/pkgs/development/python-modules/python-fedora/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fedora-infra/python-fedora";
     changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/${version}";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix
index 314f733ca1706..a22b41a3d11a2 100644
--- a/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/pkgs/development/python-modules/python-fontconfig/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Vayn/python-fontconfig";
     description = "Python binding for Fontconfig";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix
index d2cefc90b58da..b8d4563a4d333 100644
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@@ -5,6 +5,7 @@
   fetchPypi,
   iso8601,
   keystoneauth1,
+  openstackdocstheme,
   osc-lib,
   oslo-i18n,
   oslo-serialization,
@@ -16,6 +17,8 @@
   pyyaml,
   requests,
   requests-mock,
+  setuptools,
+  sphinxHook,
   stestr,
   testscenarios,
 }:
@@ -23,7 +26,7 @@
 buildPythonPackage rec {
   pname = "python-heatclient";
   version = "3.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -32,7 +35,15 @@ buildPythonPackage rec {
     hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    openstackdocstheme
+    setuptools
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
     cliff
     iso8601
     keystoneauth1
@@ -54,10 +65,14 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
+    runHook preCheck
+
     stestr run -e <(echo "
       heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file
       heatclient.tests.unit.test_deployment_utils.TempURLSignalTest.test_create_temp_url
     ")
+
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "heatclient" ];
diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix
index 13cd6f4749ee2..2936c3ec2f4cf 100644
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@@ -6,6 +6,7 @@
   dogpile-cache,
   jsonschema,
   keystoneauth1,
+  openstackdocstheme,
   openstacksdk,
   osc-lib,
   oslo-utils,
@@ -15,6 +16,9 @@
   pyyaml,
   requests,
   requests-mock,
+  setuptools,
+  sphinxcontrib-apidoc,
+  sphinxHook,
   stestr,
   stevedore,
 }:
@@ -22,14 +26,23 @@
 buildPythonPackage rec {
   pname = "python-ironicclient";
   version = "5.7.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-Blx0pr73uZA8eHd2iZ9WY+aozBFWsQhWpxoQKtjtJSk=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    openstackdocstheme
+    setuptools
+    sphinxcontrib-apidoc
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
     cliff
     dogpile-cache
     jsonschema
@@ -51,7 +64,9 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
+    runHook preCheck
     stestr run
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "ironicclient" ];
diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix
index 9150b1a240365..e4e964d52749f 100644
--- a/pkgs/development/python-modules/python-keycloak/default.nix
+++ b/pkgs/development/python-modules/python-keycloak/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/marcospereirampj/python-keycloak";
     changelog = "https://github.com/marcospereirampj/python-keycloak/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix
index 0747ee1dd7901..2d908d28c28f8 100644
--- a/pkgs/development/python-modules/python-louvain/default.nix
+++ b/pkgs/development/python-modules/python-louvain/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Louvain Community Detection";
     mainProgram = "community";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix
index f30ac614d8ffb..1d7e39ccf446f 100644
--- a/pkgs/development/python-modules/python-ly/default.nix
+++ b/pkgs/development/python-modules/python-ly/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Tool and library for manipulating LilyPond files";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix
index 24c828a80eb03..942f4562d9dbb 100644
--- a/pkgs/development/python-modules/python-magic/default.nix
+++ b/pkgs/development/python-modules/python-magic/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "Python interface to the libmagic file type identification library";
     homepage = "https://github.com/ahupp/python-magic";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix
index c3256d0d5447a..bb444dd15ab27 100644
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  installShellFiles,
   pbr,
   openstackdocstheme,
   oslo-config,
@@ -12,7 +11,8 @@
   prettytable,
   requests,
   simplejson,
-  sphinx,
+  setuptools,
+  sphinxHook,
   sphinxcontrib-programoutput,
   babel,
   osc-lib,
@@ -24,21 +24,23 @@
 buildPythonPackage rec {
   pname = "python-manilaclient";
   version = "4.9.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-TebykdG0fkeC+5Vs9eiwuJpXam41gg8gR4F2poYKDhI=";
   };
 
-  nativeBuildInputs = [
-    installShellFiles
+  build-system = [
     openstackdocstheme
-    sphinx
+    setuptools
+    sphinxHook
     sphinxcontrib-programoutput
   ];
 
-  propagatedBuildInputs = [
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
     pbr
     oslo-config
     oslo-log
@@ -53,12 +55,6 @@ buildPythonPackage rec {
     debtcollector
   ];
 
-  postInstall = ''
-    export PATH=$out/bin:$PATH
-    sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man
-    installManPage doc/build/man/python-manilaclient.1
-  '';
-
   # Checks moved to 'passthru.tests' to workaround infinite recursion
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index 1cf3b7ff4bbfa..eed723f10d8e1 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -129,7 +129,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python bindings for Mapnik";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://mapnik.org";
     license = licenses.lgpl21Plus;
   };
diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix
index 4b7ef603297d3..5291c12e53a1e 100644
--- a/pkgs/development/python-modules/python-mimeparse/default.nix
+++ b/pkgs/development/python-modules/python-mimeparse/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Module provides basic functions for parsing mime-type names and matching them against a list of media-ranges";
     homepage = "https://github.com/dbtsai/python-mimeparse";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix
index 69fedb261ed16..2484537aabf91 100644
--- a/pkgs/development/python-modules/python-ndn/default.nix
+++ b/pkgs/development/python-modules/python-ndn/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/named-data/python-ndn";
     changelog = "https://github.com/named-data/python-ndn/blob/${src.rev}/CHANGELOG.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index fc48197864abd..e3dd953e93b0b 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -3,37 +3,46 @@
   buildPythonPackage,
   fetchPypi,
   ddt,
-  installShellFiles,
   openstackdocstheme,
   osc-lib,
   pbr,
+  python-barbicanclient,
   python-cinderclient,
+  python-designateclient,
+  python-heatclient,
+  python-ironicclient,
   python-keystoneclient,
+  python-manilaclient,
   python-novaclient,
+  python-openstackclient,
   requests-mock,
-  sphinx,
+  setuptools,
+  sphinxHook,
   sphinxcontrib-apidoc,
   stestr,
+  testers,
 }:
 
 buildPythonPackage rec {
   pname = "python-openstackclient";
   version = "6.6.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw=";
   };
 
-  nativeBuildInputs = [
-    installShellFiles
+  build-system = [
     openstackdocstheme
-    sphinx
+    setuptools
+    sphinxHook
     sphinxcontrib-apidoc
   ];
 
-  propagatedBuildInputs = [
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
     osc-lib
     pbr
     python-cinderclient
@@ -41,23 +50,37 @@ buildPythonPackage rec {
     python-novaclient
   ];
 
-  postInstall = ''
-    sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man
-    installManPage doc/build/man/openstack.1
-  '';
-
   nativeCheckInputs = [
     ddt
-    stestr
     requests-mock
+    stestr
   ];
 
   checkPhase = ''
+    runHook preCheck
     stestr run
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "openstackclient" ];
 
+  passthru = {
+    optional-dependencies = {
+      # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst
+      cli-plugins = [
+        python-barbicanclient
+        python-designateclient
+        python-heatclient
+        python-ironicclient
+        python-manilaclient
+      ];
+    };
+    tests.version = testers.testVersion {
+      package = python-openstackclient;
+      command = "openstack --version";
+    };
+  };
+
   meta = with lib; {
     description = "OpenStack Command-line Client";
     mainProgram = "openstack";
diff --git a/pkgs/development/python-modules/python-openzwave/default.nix b/pkgs/development/python-modules/python-openzwave/default.nix
index 179f3fd2b9bda..6b516823c5aba 100644
--- a/pkgs/development/python-modules/python-openzwave/default.nix
+++ b/pkgs/development/python-modules/python-openzwave/default.nix
@@ -59,7 +59,7 @@ buildPythonPackage rec {
     description = "Python wrapper for the OpenZWave C++ library";
     homepage = "https://github.com/OpenZWave/python-openzwave";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (openzwave.meta) platforms;
   };
 }
diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix
index 95c047de31dbd..f29a3097c631c 100644
--- a/pkgs/development/python-modules/python-rtmidi/default.nix
+++ b/pkgs/development/python-modules/python-rtmidi/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/SpotlightKid/python-rtmidi";
     changelog = "https://github.com/SpotlightKid/python-rtmidi/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix
index 8028d3fe860bd..c640a72873259 100644
--- a/pkgs/development/python-modules/python-slugify/default.nix
+++ b/pkgs/development/python-modules/python-slugify/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/un33k/python-slugify";
     changelog = "https://github.com/un33k/python-slugify/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix
index 88f4408dd59e0..806f067173df8 100644
--- a/pkgs/development/python-modules/python-snappy/default.nix
+++ b/pkgs/development/python-modules/python-snappy/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Python library for the snappy compression library from Google";
     homepage = "https://github.com/intake/python-snappy";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix
index 208df3d95b109..0796ea2b3c96d 100644
--- a/pkgs/development/python-modules/python-socks/default.nix
+++ b/pkgs/development/python-modules/python-socks/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python";
     homepage = "https://github.com/romis2012/python-socks";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index 8fc1bcc15bcfc..6fabd9a81763d 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/WoLpH/python-utils";
     changelog = "https://github.com/wolph/python-utils/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix
index f18cd6df1d1f7..f7d3934384ce7 100644
--- a/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/pkgs/development/python-modules/pytimeparse/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/wroberts/pytimeparse";
     changelog = "https://github.com/wroberts/pytimeparse/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix
deleted file mode 100644
index eb2905444fe82..0000000000000
--- a/pkgs/development/python-modules/pyutilib/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  nose,
-  six,
-}:
-
-buildPythonPackage rec {
-  pname = "pyutilib";
-  version = "6.0.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    pname = "PyUtilib";
-    inherit version;
-    hash = "sha256-08FPjtkCioMbK/Ubird3brqH5mz8WKBrmcNZqqZA8EA=";
-  };
-
-  propagatedBuildInputs = [
-    nose
-    six
-  ];
-
-  # tests require text files that are not included in the pypi package
-  doCheck = false;
-
-  meta = with lib; {
-    description = "PyUtilib: A collection of Python utilities";
-    homepage = "https://github.com/PyUtilib/pyutilib";
-    license = licenses.bsd3;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix
index 47002d63d0b99..16260ed5de0a3 100644
--- a/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/pkgs/development/python-modules/pyvmomi/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/vmware/pyvmomi";
     changelog = "https://github.com/vmware/pyvmomi/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index f61baecd5e850..9f5ed908aef8f 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "https://pywbem.github.io";
     changelog = "https://github.com/pywbem/pywbem/blob/${version}/docs/changes.rst";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix
index 84cec559cc1af..5e14b6cd84827 100644
--- a/pkgs/development/python-modules/pyyaml-include/default.nix
+++ b/pkgs/development/python-modules/pyyaml-include/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Extending PyYAML with a custom constructor for including YAML files within YAML files";
     homepage = "https://github.com/tanbro/pyyaml-include";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index f927515894c37..6c4b8076294fd 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -88,6 +88,6 @@ buildPythonPackage rec {
       bsd3 # or
       lgpl3Only
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix
index 3e19b7bce5f12..16fe955ef8389 100644
--- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix
+++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
       some non-UTF8 locale settings.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index c0ac1f4bff047..2c7df77b33a10 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/lincolnloop/python-qrcode";
     changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 6cf875c9f1553..0b7c60d3f4148 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/spyder-ide/qtawesome";
     changelog = "https://github.com/spyder-ide/qtawesome/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux; # fails on Darwin
   };
 }
diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix
index 74f28e526ff8d..17a7b28d05030 100644
--- a/pkgs/development/python-modules/quantities/default.nix
+++ b/pkgs/development/python-modules/quantities/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://python-quantities.readthedocs.io/";
     changelog = "https://github.com/python-quantities/python-quantities/blob/v${version}/CHANGES.txt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix
index eee800736a6c3..53105b8ef7495 100644
--- a/pkgs/development/python-modules/queuelib/default.nix
+++ b/pkgs/development/python-modules/queuelib/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Collection of persistent (disk-based) queues for Python";
     homepage = "https://github.com/scrapy/queuelib";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix
index 959c5e1d52236..b8970bc1ccd4b 100644
--- a/pkgs/development/python-modules/railroad-diagrams/default.nix
+++ b/pkgs/development/python-modules/railroad-diagrams/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Module to generate SVG railroad syntax diagrams";
     homepage = "https://github.com/tabatkins/railroad-diagrams";
     license = licenses.cc0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix
index 4efb631ad7f37..22fef92b576d2 100644
--- a/pkgs/development/python-modules/ramlfications/default.nix
+++ b/pkgs/development/python-modules/ramlfications/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     mainProgram = "ramlfications";
     homepage = "https://ramlfications.readthedocs.org";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index c0c462cb44784..ec0ebf0302caf 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/markokr/rarfile";
     changelog = "https://github.com/markokr/rarfile/releases/tag/v${version}";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix
index e4b50337f05a1..00f469329e660 100644
--- a/pkgs/development/python-modules/rawkit/default.nix
+++ b/pkgs/development/python-modules/rawkit/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "CTypes based LibRaw bindings for Python";
     homepage = "https://rawkit.readthedocs.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix
index 98c442139dca7..609e6c12288d1 100644
--- a/pkgs/development/python-modules/ray/binary-hashes.nix
+++ b/pkgs/development/python-modules/ray/binary-hashes.nix
@@ -1,11 +1,11 @@
 {
   cp310 = {
-    hash = "sha256-YlQ2hoW5MjQkOJ4L2/GsomlyX3rkNDjdC82hZ0RwzGw=";
+    hash = "sha256-cHxgTJS5t5nQXi//EWtyUHhGelZbbd5mOs9cegeaj58=";
   };
   cp311 = {
-    hash = "sha256-VhbwU8sSccbuybGCPGeEF+lXv9fGGtVs1+e4S5vOURI=";
+    hash = "sha256-+rj/xdcVHe23UOzZ6YbTq7ULMgYTyjeN5peNoa3NMVc=";
   };
   cp312 = {
-    hash = "sha256-EYug39E5RXG8W8x7aQTajcbFmvq8FZiXxdiSKV3htBE=";
+    hash = "sha256-4GWQJp0OUjt2X+Hw+E0HpWv04TN8HlSkIoEHsHIrfe0=";
   };
 }
diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index 69fbb8cae968b..9430001fff90f 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -1,58 +1,62 @@
 {
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  pythonAtLeast,
+  python,
+  fetchPypi,
+  autoPatchelfHook,
+
+  # dependencies
   aiohttp,
   aiohttp-cors,
-  aiorwlock,
   aiosignal,
   attrs,
-  autoPatchelfHook,
-  buildPythonPackage,
-  fetchPypi,
   click,
   cloudpickle,
   colorama,
   colorful,
   cython,
-  dm-tree,
-  fastapi,
   filelock,
   frozenlist,
-  fsspec,
   gpustat,
   grpcio,
-  gym,
   jsonschema,
-  lib,
-  lz4,
-  matplotlib,
   msgpack,
   numpy,
   opencensus,
   packaging,
-  pandas,
-  py-spy,
   prometheus-client,
   psutil,
-  pyarrow,
   pydantic,
-  python,
-  pythonAtLeast,
-  pythonOlder,
+  py-spy,
   pyyaml,
   requests,
-  scikit-image,
-  scipy,
   setproctitle,
   smart-open,
+  virtualenv,
+
+  # optional-dependencies
+  fsspec,
+  pandas,
+  pyarrow,
+  dm-tree,
+  gym,
+  lz4,
+  matplotlib,
+  scikit-image,
+  scipy,
+  aiorwlock,
+  fastapi,
   starlette,
+  uvicorn,
   tabulate,
   tensorboardx,
-  uvicorn,
-  virtualenv,
 }:
 
 let
   pname = "ray";
-  version = "2.32.0";
+  version = "2.33.0";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -76,39 +80,6 @@ buildPythonPackage rec {
       // binary-hash
     );
 
-  passthru.optional-dependencies = rec {
-    data-deps = [
-      pandas
-      pyarrow
-      fsspec
-    ];
-
-    serve-deps = [
-      aiorwlock
-      fastapi
-      pandas
-      starlette
-      uvicorn
-    ];
-
-    tune-deps = [
-      tabulate
-      tensorboardx
-    ];
-
-    rllib-deps = tune-deps ++ [
-      dm-tree
-      gym
-      lz4
-      matplotlib
-      scikit-image
-      pyyaml
-      scipy
-    ];
-
-    air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps;
-  };
-
   nativeBuildInputs = [
     autoPatchelfHook
   ];
@@ -121,10 +92,10 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    attrs
     aiohttp
     aiohttp-cors
     aiosignal
+    attrs
     click
     cloudpickle
     colorama
@@ -139,10 +110,10 @@ buildPythonPackage rec {
     numpy
     opencensus
     packaging
-    py-spy
     prometheus-client
     psutil
     pydantic
+    py-spy
     pyyaml
     requests
     setproctitle
@@ -150,6 +121,35 @@ buildPythonPackage rec {
     virtualenv
   ];
 
+  optional-dependencies = rec {
+    air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps;
+    data-deps = [
+      fsspec
+      pandas
+      pyarrow
+    ];
+    rllib-deps = tune-deps ++ [
+      dm-tree
+      gym
+      lz4
+      matplotlib
+      pyyaml
+      scikit-image
+      scipy
+    ];
+    serve-deps = [
+      aiorwlock
+      fastapi
+      pandas
+      starlette
+      uvicorn
+    ];
+    tune-deps = [
+      tabulate
+      tensorboardx
+    ];
+  };
+
   postInstall = ''
     chmod +x $out/${python.sitePackages}/ray/core/src/ray/{gcs/gcs_server,raylet/raylet}
   '';
diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix
index ce3442245a580..7f32b5075d504 100644
--- a/pkgs/development/python-modules/rcssmin/default.nix
+++ b/pkgs/development/python-modules/rcssmin/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "CSS minifier written in pure python";
     homepage = "http://opensource.perlig.de/rcssmin/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 7c131ffe8bc2f..b0f2b4c7cd2a2 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -93,6 +93,6 @@ buildPythonPackage rec {
     description = "Python library for working with RDF";
     homepage = "https://rdflib.readthedocs.io";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix
index 74fec466ad927..9089bd1b44dd4 100644
--- a/pkgs/development/python-modules/readmdict/default.nix
+++ b/pkgs/development/python-modules/readmdict/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     mainProgram = "readmdict";
     homepage = "https://github.com/ffreemt/readmdict";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
index 2aebf689bbaa9..7bec155f52a1e 100644
--- a/pkgs/development/python-modules/rebulk/default.nix
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Toilal/rebulk/";
     changelog = "https://github.com/Toilal/rebulk/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix
index f80732ad7b3b0..842c57a4ec663 100644
--- a/pkgs/development/python-modules/recline/default.nix
+++ b/pkgs/development/python-modules/recline/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "This library helps you quickly implement an interactive command-based application";
     homepage = "https://github.com/NetApp/recline";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix
index e5dea4940b317..ea995ee27a7db 100644
--- a/pkgs/development/python-modules/regional/default.nix
+++ b/pkgs/development/python-modules/regional/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Simple manipualtion and display of spatial regions";
     homepage = "https://github.com/freeman-lab/regional";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix
index f9a0cf8164005..388e7ec9cd810 100644
--- a/pkgs/development/python-modules/rencode/default.nix
+++ b/pkgs/development/python-modules/rencode/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/aresch/rencode";
     description = "Fast (basic) object serialization similar to bencode";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index 61ff8046da7d7..186b02c60375c 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     description = "Open Source Python library for generating PDFs and graphics";
     homepage = "https://www.reportlab.com/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/repoze-who/default.nix b/pkgs/development/python-modules/repoze-who/default.nix
index abbc62a0aa83b..6616b1c1e027d 100644
--- a/pkgs/development/python-modules/repoze-who/default.nix
+++ b/pkgs/development/python-modules/repoze-who/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     homepage = "http://www.repoze.org";
     changelog = "https://github.com/repoze/repoze.who/blob/${version}/CHANGES.rst";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix
index d76cdfbdaefb0..80c72a0b46141 100644
--- a/pkgs/development/python-modules/requests-file/default.nix
+++ b/pkgs/development/python-modules/requests-file/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dashea/requests-file";
     changelog = "https://github.com/dashea/requests-file/blob/${version}/CHANGES.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix
index 50afeafe218eb..1368b5e0dbfcc 100644
--- a/pkgs/development/python-modules/requirements-parser/default.nix
+++ b/pkgs/development/python-modules/requirements-parser/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/davidfischer/requirements-parser";
     changelog = "https://github.com/madpah/requirements-parser/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix
index 9250bf55931e6..eb93492e75947 100644
--- a/pkgs/development/python-modules/resampy/default.nix
+++ b/pkgs/development/python-modules/resampy/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Efficient signal resampling";
     homepage = "https://github.com/bmcfee/resampy";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix
index 15c05ed6da6af..98e8e8d6487d7 100644
--- a/pkgs/development/python-modules/resolvelib/default.nix
+++ b/pkgs/development/python-modules/resolvelib/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sarugaku/resolvelib";
     changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix
index 320603a10b818..11eab85380a65 100644
--- a/pkgs/development/python-modules/retrying/default.nix
+++ b/pkgs/development/python-modules/retrying/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "General-purpose retrying library";
     homepage = "https://github.com/rholder/retrying";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rfc3986-validator/default.nix b/pkgs/development/python-modules/rfc3986-validator/default.nix
index 0f681dba2413d..bceb67a22594a 100644
--- a/pkgs/development/python-modules/rfc3986-validator/default.nix
+++ b/pkgs/development/python-modules/rfc3986-validator/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Pure python rfc3986 validator";
     homepage = "https://github.com/naimetti/rfc3986-validator";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index 8fbf10e332a9a..863d4562056d6 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Validating URI References per RFC 3986";
     homepage = "https://rfc3986.readthedocs.org";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix
index 063f6146a192d..596a2ca07290e 100644
--- a/pkgs/development/python-modules/rfc6555/default.nix
+++ b/pkgs/development/python-modules/rfc6555/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Python implementation of the Happy Eyeballs Algorithm";
     homepage = "https://github.com/sethmlarson/rfc6555";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix
index 75790f1e3cc50..318282f763a0a 100644
--- a/pkgs/development/python-modules/ripser/default.nix
+++ b/pkgs/development/python-modules/ripser/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://ripser.scikit-tda.org";
     changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix
index cdfeebb491694..b3984446c404d 100644
--- a/pkgs/development/python-modules/rjsmin/default.nix
+++ b/pkgs/development/python-modules/rjsmin/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Module to minify Javascript";
     homepage = "http://opensource.perlig.de/rjsmin/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index f04ecac4c4b91..3c258f2b8feaf 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "RLP serialization library";
     homepage = "https://github.com/ethereum/pyrlp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix
index 542aea236da41..38080bd66615f 100644
--- a/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Robot Framework keyword library wrapper around the HTTP client library requests";
     homepage = "https://github.com/bulkan/robotframework-requests";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix
index 40e97073c7bce..cd71a84d64132 100644
--- a/pkgs/development/python-modules/rollbar/default.nix
+++ b/pkgs/development/python-modules/rollbar/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     mainProgram = "rollbar";
     homepage = "https://github.com/rollbar/pyrollbar";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix
index 153aac57546ce..925653572f363 100644
--- a/pkgs/development/python-modules/routes/default.nix
+++ b/pkgs/development/python-modules/routes/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Re-implementation of the Rails routes system for mapping URLs to application actions";
     homepage = "https://github.com/bbangert/routes";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix
index a700b4c411370..6d8bf78b6d3c5 100644
--- a/pkgs/development/python-modules/rtmidi-python/default.nix
+++ b/pkgs/development/python-modules/rtmidi-python/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Python wrapper for RtMidi";
     homepage = "https://github.com/superquadratic/rtmidi-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ruamel-base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix
index 65e96e71faa8b..2d38ff808ddab 100644
--- a/pkgs/development/python-modules/ruamel-base/default.nix
+++ b/pkgs/development/python-modules/ruamel-base/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Common routines for ruamel packages";
     homepage = "https://sourceforge.net/projects/ruamel-base/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
index 1f898ed67073e..58a41a102246c 100644
--- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index cfd009e7fd047..eeb77714fddc8 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://sourceforge.net/projects/ruamel-yaml/";
     changelog = "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/runs/default.nix b/pkgs/development/python-modules/runs/default.nix
index d161a33a108a5..19ea9683b3784 100644
--- a/pkgs/development/python-modules/runs/default.nix
+++ b/pkgs/development/python-modules/runs/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/rec/runs";
     changelog = "https://github.com/rec/runs/blob/${src.rev}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix
index a4a729ce4280c..08ce5f72eaaa3 100644
--- a/pkgs/development/python-modules/s2clientprotocol/default.nix
+++ b/pkgs/development/python-modules/s2clientprotocol/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "StarCraft II - client protocol";
     homepage = "https://github.com/Blizzard/s2client-proto";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix
index 4153fe1aa8113..d33c4597e8704 100644
--- a/pkgs/development/python-modules/sacn/default.nix
+++ b/pkgs/development/python-modules/sacn/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Hundemeier/sacn";
     changelog = "https://github.com/Hundemeier/sacn/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/safeio/default.nix b/pkgs/development/python-modules/safeio/default.nix
index 890e986a81b54..d1920654d2ef3 100644
--- a/pkgs/development/python-modules/safeio/default.nix
+++ b/pkgs/development/python-modules/safeio/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Safely make I/O operations to files in Python even from multiple threads";
     homepage = "https://github.com/Animenosekai/safeIO";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix
index 780f8560840e2..98a9503f44572 100644
--- a/pkgs/development/python-modules/sarif-om/default.nix
+++ b/pkgs/development/python-modules/sarif-om/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Classes implementing the SARIF 2.1.0 object model";
     homepage = "https://github.com/microsoft/sarif-python-om";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix
index 10d557f774952..62115a6296376 100644
--- a/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/pkgs/development/python-modules/scancode-toolkit/default.nix
@@ -156,6 +156,6 @@ buildPythonPackage rec {
       asl20
       cc-by-40
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix
index 102d4d6adc83a..c0b86fd2ddfda 100644
--- a/pkgs/development/python-modules/schedule/default.nix
+++ b/pkgs/development/python-modules/schedule/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dbader/schedule";
     changelog = "https://github.com/dbader/schedule/blob/${version}/HISTORY.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix
index fb58a91c68e57..57cc5902ed73f 100644
--- a/pkgs/development/python-modules/scikit-fmm/default.nix
+++ b/pkgs/development/python-modules/scikit-fmm/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Python extension module which implements the fast marching method";
     homepage = "https://github.com/scikit-fmm/scikit-fmm";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix
index 53a8faaaa7ee7..63014b75aa347 100644
--- a/pkgs/development/python-modules/scramp/default.nix
+++ b/pkgs/development/python-modules/scramp/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "Implementation of the SCRAM authentication protocol";
     homepage = "https://github.com/tlocke/scramp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index e987c8ab4c6b3..ddb8416598b2c 100644
--- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/alecxe/scrapy-fake-useragent";
     changelog = "https://github.com/alecxe/scrapy-fake-useragent/blob/master/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix
index 9583ae6b28d97..a480429b6f31f 100644
--- a/pkgs/development/python-modules/scripttest/default.nix
+++ b/pkgs/development/python-modules/scripttest/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for testing interactive command-line applications";
     homepage = "https://pypi.org/project/scripttest/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index dd311a7642530..4d46563e92a84 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ludbb/secp256k1-py";
     description = "Python FFI bindings for secp256k1";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix
index 0d2a5cf8bb92e..f78cda89176c3 100644
--- a/pkgs/development/python-modules/secure/default.nix
+++ b/pkgs/development/python-modules/secure/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Adds optional security headers and cookie attributes for Python web frameworks";
     homepage = "https://github.com/TypeError/secure.py";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 091bf550bdf3c..322446fd0353b 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     mainProgram = "segments";
     homepage = "https://github.com/cldf/segments";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix
index c9e17cb0a2aa6..06beaabdbcd5f 100644
--- a/pkgs/development/python-modules/send2trash/default.nix
+++ b/pkgs/development/python-modules/send2trash/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/hsoft/send2trash";
     changelog = "https://github.com/arsenetar/send2trash/blob/${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix
index ea6503bd001ec..1b88987698ce1 100644
--- a/pkgs/development/python-modules/sentence-splitter/default.nix
+++ b/pkgs/development/python-modules/sentence-splitter/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Text to sentence splitter using heuristic algorithm by Philipp Koehn and Josh Schroeder";
     homepage = "https://github.com/mediacloud/sentence-splitter";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix
index aa9cd7c01fa9b..a8a06ed89ab24 100644
--- a/pkgs/development/python-modules/seqeval/default.nix
+++ b/pkgs/development/python-modules/seqeval/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Python framework for sequence labeling evaluation";
     homepage = "https://github.com/chakki-works/seqeval";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix
index 324ad056cc58a..10f0561849722 100644
--- a/pkgs/development/python-modules/serpy/default.nix
+++ b/pkgs/development/python-modules/serpy/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Ridiculously fast object serialization";
     homepage = "https://github.com/clarkduvall/serpy";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix
index 734eef48a0efb..2e093e7823062 100644
--- a/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/PyO3/setuptools-rust";
     changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix
index a410c430f60cc..4eb5d9f81322e 100644
--- a/pkgs/development/python-modules/sexpdata/default.nix
+++ b/pkgs/development/python-modules/sexpdata/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jd-boyd/sexpdata";
     changelog = "https://github.com/jd-boyd/sexpdata/releases/tag/v${version}";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/show-in-file-manager/default.nix b/pkgs/development/python-modules/show-in-file-manager/default.nix
index 0d52bdb52bd4e..a43b08ee1c9e1 100644
--- a/pkgs/development/python-modules/show-in-file-manager/default.nix
+++ b/pkgs/development/python-modules/show-in-file-manager/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
       something with them.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix
index ef386cfd378e2..a03238cf2e00c 100644
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/pkgs/development/python-modules/signedjson/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Sign JSON with Ed25519 signatures";
     homepage = "https://github.com/matrix-org/python-signedjson";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 56d7ecd6c5e94..50afaabf6e989 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -82,7 +82,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/sigstore/sigstore-python";
     changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "sigstore";
   };
 }
diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix
index d1122d16cfbf3..46c3e3caad9f6 100644
--- a/pkgs/development/python-modules/sigtools/default.nix
+++ b/pkgs/development/python-modules/sigtools/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Utilities for working with inspect.Signature objects";
     homepage = "https://sigtools.readthedocs.io/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix
index c529e2ab04ae8..b876c0e487015 100644
--- a/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/pkgs/development/python-modules/simple-salesforce/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/simple-salesforce/simple-salesforce";
     changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/v${version}/CHANGES";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix
index e31fe1873f189..3cd1ddface07c 100644
--- a/pkgs/development/python-modules/simplemma/default.nix
+++ b/pkgs/development/python-modules/simplemma/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency";
     homepage = "https://github.com/adbar/simplemma";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix
index d717ab1b32b81..2c3203446683d 100644
--- a/pkgs/development/python-modules/simplenote/default.nix
+++ b/pkgs/development/python-modules/simplenote/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Python library for the simplenote.com web service";
     homepage = "http://readthedocs.org/docs/simplenotepy/en/latest/api.html";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix
index cc4e4fa3f3a7a..894ad9e1da423 100644
--- a/pkgs/development/python-modules/single-source/default.nix
+++ b/pkgs/development/python-modules/single-source/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/rabbit72/single-source";
     changelog = "https://github.com/rabbit72/single-source/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix
index b13416271f584..20c6187a2c25a 100644
--- a/pkgs/development/python-modules/skytemple-icons/default.nix
+++ b/pkgs/development/python-modules/skytemple-icons/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/SkyTemple/skytemple-icons";
     description = "Icons for SkyTemple";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix
index d76fb9fa16792..6dc89369d0c39 100644
--- a/pkgs/development/python-modules/slicerator/default.nix
+++ b/pkgs/development/python-modules/slicerator/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Lazy-loading, fancy-sliceable iterable";
     homepage = "https://github.com/soft-matter/slicerator";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/slpp/default.nix b/pkgs/development/python-modules/slpp/default.nix
index c21a183269a0a..10c964c61177c 100644
--- a/pkgs/development/python-modules/slpp/default.nix
+++ b/pkgs/development/python-modules/slpp/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Simple lua-python parser";
     homepage = "https://github.com/SirAnthony/slpp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix
index e81479419aa01..4a1753d7a7aeb 100644
--- a/pkgs/development/python-modules/smpplib/default.nix
+++ b/pkgs/development/python-modules/smpplib/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/python-smpplib/python-smpplib";
     changelog = "https://github.com/python-smpplib/python-smpplib/releases/tag/${version}";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix
index 5570972d24a49..c07ac11055e68 100644
--- a/pkgs/development/python-modules/snakebite/default.nix
+++ b/pkgs/development/python-modules/snakebite/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     mainProgram = "snakebite";
     homepage = "https://github.com/spotify/snakebite";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix
index dd2e2f192b815..4c697fcdb9238 100644
--- a/pkgs/development/python-modules/snapshottest/default.nix
+++ b/pkgs/development/python-modules/snapshottest/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Snapshot testing for pytest, unittest, Django, and Nose";
     homepage = "https://github.com/syrusakbary/snapshottest";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 736612551ccd8..77bc5b2cd1529 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -90,6 +90,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/snowflakedb/snowflake-connector-python";
     changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/v${version}/DESCRIPTION.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
index c8de14dd7fdd8..a10d9b6ff5d96 100644
--- a/pkgs/development/python-modules/somajo/default.nix
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     mainProgram = "somajo-tokenizer";
     homepage = "https://github.com/tsproisl/SoMaJo";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix
index a764cf6d5ddec..967119bbe776c 100644
--- a/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/pkgs/development/python-modules/sortedcontainers/default.nix
@@ -34,7 +34,7 @@ let
       description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet";
       homepage = "https://grantjenks.com/docs/sortedcontainers/";
       license = licenses.asl20;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix
index 1fa7977f4bbec..fa777afe1f410 100644
--- a/pkgs/development/python-modules/soundcloud-v2/default.nix
+++ b/pkgs/development/python-modules/soundcloud-v2/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Python wrapper for the v2 SoundCloud API";
     homepage = "https://github.com/7x11x13/soundcloud.py";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix
index 96dfbe9d8440b..afdc32ac1aa8e 100644
--- a/pkgs/development/python-modules/soupsieve/default.nix
+++ b/pkgs/development/python-modules/soupsieve/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "CSS4 selector implementation for Beautiful Soup";
     license = licenses.mit;
     homepage = "https://github.com/facelessuser/soupsieve";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix
index fd548f5eb311e..66b1c20655124 100644
--- a/pkgs/development/python-modules/spacy-alignments/default.nix
+++ b/pkgs/development/python-modules/spacy-alignments/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage rec {
     description = "Align tokenizations for spaCy and transformers";
     homepage = "https://github.com/explosion/spacy-alignments";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/spacy-pkuseg/default.nix b/pkgs/development/python-modules/spacy-pkuseg/default.nix
index 04b8ca7e71dc9..f1896a50ad182 100644
--- a/pkgs/development/python-modules/spacy-pkuseg/default.nix
+++ b/pkgs/development/python-modules/spacy-pkuseg/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)";
     homepage = "https://github.com/explosion/spacy-pkuseg";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 0f47280570c6c..171a9ddb607d1 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -135,6 +135,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/explosion/spaCy";
     changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
index cfd6569472052..6c6e5b76eeafb 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -58,6 +58,6 @@ buildPythonPackage rec {
     changelog = "https://sparse.pydata.org/en/stable/changelog.html";
     downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix
index 5c65ccaeb4124..15d4262b69697 100644
--- a/pkgs/development/python-modules/sphinx-book-theme/default.nix
+++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/sphinx-book-theme";
     changelog = "https://github.com/executablebooks/sphinx-book-theme/raw/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-comments/default.nix b/pkgs/development/python-modules/sphinx-comments/default.nix
index 867a457c0cf1f..65dedffdfacbb 100644
--- a/pkgs/development/python-modules/sphinx-comments/default.nix
+++ b/pkgs/development/python-modules/sphinx-comments/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Add comments and annotation to your documentation";
     homepage = "https://github.com/executablebooks/sphinx-comments";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix
index 2b6fbde61ad3d..4e71346021089 100644
--- a/pkgs/development/python-modules/sphinx-design/default.nix
+++ b/pkgs/development/python-modules/sphinx-design/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/sphinx-design";
     changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix
index fcb02b334a2b2..ab45c1b8bfaf4 100644
--- a/pkgs/development/python-modules/sphinx-external-toc/default.nix
+++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/sphinx-external-toc";
     changelog = "https://github.com/executablebooks/sphinx-external-toc/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix
index f1b4aa32402e0..7627dddd4ba54 100644
--- a/pkgs/development/python-modules/sphinx-jinja/default.nix
+++ b/pkgs/development/python-modules/sphinx-jinja/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Sphinx extension to include jinja templates in documentation";
     homepage = "https://github.com/tardyp/sphinx-jinja";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
index cca7c7fa4845f..0df375058c153 100644
--- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
+++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex";
     changelog = "https://github.com/executablebooks/sphinx-jupyterbook-latex/raw/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
index f24112e2379e1..66ca1490bacab 100644
--- a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
+++ b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/sphinx-multitoc-numbering";
     changelog = "https://github.com/executablebooks/sphinx-multitoc-numbering/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix
index cc6ac01aad99b..bae64efe89490 100644
--- a/pkgs/development/python-modules/sphinx-thebe/default.nix
+++ b/pkgs/development/python-modules/sphinx-thebe/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/sphinx-thebe";
     changelog = "https://github.com/executablebooks/sphinx-thebe/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/pkgs/development/python-modules/sphinx-togglebutton/default.nix
index f8b2c288ec93e..4af3ba41ce103 100644
--- a/pkgs/development/python-modules/sphinx-togglebutton/default.nix
+++ b/pkgs/development/python-modules/sphinx-togglebutton/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Toggle page content and collapse admonitions in Sphinx";
     homepage = "https://github.com/executablebooks/sphinx-togglebutton";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
index 36ee3d3c55593..f935b694e630d 100644
--- a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Sphinx extension to add asyncio-specific markups";
     homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index c190e1e625a58..dbd91f0e5da66 100644
--- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     description = "Sphinx extension for BibTeX style citations";
     homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
index 8fcb0c2c8f581..159cc00b32efa 100644
--- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
@@ -43,7 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Sphinx blockdiag extension";
     homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd2;
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
index 0d4735caa6d02..e21f983ee759a 100644
--- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Provides a Sphinx domain for embedding UML diagram with PlantUML";
     homepage = "https://github.com/sphinx-contrib/plantuml/";
     license = with licenses; [ bsd2 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
index bf41b078d55e5..6da63b666125f 100644
--- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Sphinx extension to include program output";
     homepage = "https://github.com/NextThought/sphinxcontrib-programoutput";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index a9125ef5d468f..6bff5f2fc6c72 100644
--- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sphinx-contrib/spelling";
     changelog = "https://github.com/sphinx-contrib/spelling/blob/${version}/docs/source/history.rst";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
index f5bab742f90b8..50c892cd5cd51 100644
--- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "TikZ extension for Sphinx";
     homepage = "https://bitbucket.org/philexander/tikz";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index 10ea12e7fefae..77452fbccde61 100644
--- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
@@ -60,6 +60,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";
     changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix
index 5883df4587cba..811e70487945e 100644
--- a/pkgs/development/python-modules/sqlite-anyio/default.nix
+++ b/pkgs/development/python-modules/sqlite-anyio/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/davidbrochart/sqlite-anyio";
     changelog = "https://github.com/davidbrochart/sqlite-anyio/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix
index 211bbafd06662..75eccd5268eb0 100644
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://www.sqlobject.org/";
     changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix
index 5e443c6665b54..9455f16b18f61 100644
--- a/pkgs/development/python-modules/srptools/default.nix
+++ b/pkgs/development/python-modules/srptools/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/idlesign/srptools";
     changelog = "https://github.com/idlesign/srptools/blob/v${version}/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix
index 6a8646be1a5b9..b1badbc6c71ba 100644
--- a/pkgs/development/python-modules/srt/default.nix
+++ b/pkgs/development/python-modules/srt/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cdown/srt";
     description = "Tiny but featureful Python library for parsing, modifying, and composing SRT files";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix
index 37d133ef17df5..1422b50c320d1 100644
--- a/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/pkgs/development/python-modules/sshtunnel/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     mainProgram = "sshtunnel";
     homepage = "https://github.com/pahaz/sshtunnel";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix
index 4f43cb0120b01..5664dc2eaefb5 100644
--- a/pkgs/development/python-modules/statistics/default.nix
+++ b/pkgs/development/python-modules/statistics/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "Python 2.* port of 3.4 Statistics Module";
     homepage = "https://github.com/digitalemagine/py-statistics";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index ee3d79302a2c2..2e92efe1e5bd0 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/daltonmaag/statmake";
     changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix
index 9c739a6ec1997..6109e6ce2fc7c 100644
--- a/pkgs/development/python-modules/stdlib-list/default.nix
+++ b/pkgs/development/python-modules/stdlib-list/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "List of Python Standard Libraries";
     homepage = "https://github.com/jackmaney/python-stdlib-list";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix
index 6578e3c119575..0744764df1ae7 100644
--- a/pkgs/development/python-modules/stm32loader/default.nix
+++ b/pkgs/development/python-modules/stm32loader/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/florisla/stm32loader";
     changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix
index 0abcbcf4bef7e..d7698c977d0ab 100644
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/dropbox/stone";
     changelog = "https://github.com/dropbox/stone/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "stone";
   };
 }
diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index 651ebc559731b..eea52b8fa8f26 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -81,6 +81,6 @@ buildPythonPackage rec {
     description = "Pipelines to manage continuous streams of data";
     homepage = "https://github.com/python-streamz/streamz";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix
index 793a83c3bc08c..9e5a4ed1e3e35 100644
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://hitchdev.com/strictyaml/";
     changelog = "https://hitchdev.com/strictyaml/changelog/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index d4ab87780f27e..3c8139edbc737 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/stripe/stripe-python";
     changelog = "https://github.com/stripe/stripe-python/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix
index 6587e6193e118..f8d9015b28405 100644
--- a/pkgs/development/python-modules/stumpy/default.nix
+++ b/pkgs/development/python-modules/stumpy/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     description = "Library that can be used for a variety of time series data mining tasks";
     homepage = "https://github.com/TDAmeritrade/stumpy";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index afabfff242f2d..e1bfc94ceab46 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -159,7 +159,7 @@ buildPythonPackage rec {
     description = "Python for Solar Physics";
     homepage = "https://sunpy.org";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix
index a0aff938ab03d..8a8dd2ed16520 100644
--- a/pkgs/development/python-modules/sure/default.nix
+++ b/pkgs/development/python-modules/sure/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://sure.readthedocs.io/";
     changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/svgutils/default.nix b/pkgs/development/python-modules/svgutils/default.nix
index 307b6f689a740..40e50d9b9a0f7 100644
--- a/pkgs/development/python-modules/svgutils/default.nix
+++ b/pkgs/development/python-modules/svgutils/default.nix
@@ -2,11 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  fetchpatch2,
   setuptools,
   lxml,
   pytestCheckHook,
-  nose,
 }:
 
 buildPythonPackage rec {
@@ -25,13 +24,24 @@ buildPythonPackage rec {
 
   dependencies = [ lxml ];
 
-  doCheck = pythonOlder "3.12";
+  patches = [
+    # Remove nose dependency, see: https://github.com/btel/svg_utils/pull/131
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    nose
+    # this first commit is required, as isort moved nose imports
+    (fetchpatch2 {
+      url = "https://github.com/btel/svg_utils/commit/48b078a729aeb6b1160142ab65157474c95a61b6.patch?full_index=1";
+      hash = "sha256-9toOFfNkgGF3TvM340vYOTkuSEHBeiyBRSGqqobfiqI=";
+    })
+
+    # migrate to pytest
+    (fetchpatch2 {
+      url = "https://github.com/btel/svg_utils/commit/931a80220be7c0efa2fc6e1d47858d69a08df85e.patch?full_index=1";
+      hash = "sha256-SMv0i8p3s57TDn6NM17RrHF9kVgsy2YJJ0KEBQKn2J0=";
+    })
   ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   pythonImportsCheck = [ "svgutils" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index 0d2e4b3d3377a..57e3c394843d8 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cjw296/sybil";
     changelog = "https://github.com/simplistix/sybil/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/synologydsm-api/default.nix b/pkgs/development/python-modules/synologydsm-api/default.nix
deleted file mode 100644
index 6fc64f5baad7e..0000000000000
--- a/pkgs/development/python-modules/synologydsm-api/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  pythonOlder,
-  fetchFromGitHub,
-  fetchpatch,
-  poetry-core,
-  requests,
-  urllib3,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "synologydsm-api";
-  version = "1.0.2";
-
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "hacf-fr";
-    repo = "synologydsm-api";
-    rev = "v${version}";
-    hash = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8=";
-  };
-
-  patches = [
-    # https://github.com/hacf-fr/synologydsm-api/pull/84
-    (fetchpatch {
-      name = "switch-to-poetry-core.patch";
-      url = "https://github.com/hacf-fr/synologydsm-api/commit/f1ea2be927388bdff6d43d09027b82a854635e34.patch";
-      hash = "sha256-+c25zLkTtjeX7IE+nZEnjrWfnDhDJpeHN7qRKO5rF4g=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  pythonRelaxDeps = [ "urllib3" ];
-
-  propagatedBuildInputs = [
-    requests
-    urllib3
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "synology_dsm" ];
-
-  meta = with lib; {
-    description = "Python API for communication with Synology DSM";
-    mainProgram = "synologydsm-api";
-    homepage = "https://github.com/hacf-fr/synologydsm-api";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index ac6cdafda0314..379091993e0ad 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Pytest Snapshot Test Utility";
     homepage = "https://github.com/tophat/syrupy";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix
index 994449debbba6..1c2906333437f 100644
--- a/pkgs/development/python-modules/tabcmd/default.nix
+++ b/pkgs/development/python-modules/tabcmd/default.nix
@@ -96,7 +96,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/tableau/tabcmd";
     changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tabcmd";
   };
 }
diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix
index 1d9b22ce5b4e7..9f841867cb5ef 100644
--- a/pkgs/development/python-modules/tableaudocumentapi/default.nix
+++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/tableau/document-api-python";
     changelog = "https://github.com/tableau/document-api-python/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix
index e37539b18de64..032b4e189b70f 100644
--- a/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/pkgs/development/python-modules/tableauserverclient/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/tableau/server-client-python";
     changelog = "https://github.com/tableau/server-client-python/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 38c58f5cb313b..443b83ce78103 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -76,6 +76,6 @@ buildPythonPackage rec {
     homepage = "https://tablib.readthedocs.io/";
     changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix
index d1d7697331d01..5e601845b4cc3 100644
--- a/pkgs/development/python-modules/tatsu/default.nix
+++ b/pkgs/development/python-modules/tatsu/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://tatsu.readthedocs.io/";
     changelog = "https://github.com/neogeny/TatSu/releases/tag/v${version}";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix
index f2cec77022a70..d9a0c20070de4 100644
--- a/pkgs/development/python-modules/tbm-utils/default.nix
+++ b/pkgs/development/python-modules/tbm-utils/default.nix
@@ -82,6 +82,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/thebigmunch/tbm-utils";
     changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tdir/default.nix b/pkgs/development/python-modules/tdir/default.nix
index 4f0fe0ee60594..c00e0b3f0bc5d 100644
--- a/pkgs/development/python-modules/tdir/default.nix
+++ b/pkgs/development/python-modules/tdir/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/rec/tdir";
     changelog = "https://github.com/rec/tdir/blob/${src.rev}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index 66b7e1aee3db9..77326c7152c18 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -42,6 +42,8 @@ buildPythonPackage rec {
     hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU=";
   };
 
+  pythonRelaxDeps = [ "defusedxml" ];
+
   nativeBuildInputs = [ setuptools ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index 6c2a136d831ea..23c8e031c4892 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jaraco/tempora";
     changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 77d8d069079bb..c6eab56480f10 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1198";
+  version = "3.0.1199";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ee+pRRmjw319AkC12TOuBRdRkFDzKibexXspteQxsAw=";
+    hash = "sha256-RhrO4zRmNxrLFQLajQ+UftY1squDddxI8LiQymSOvSo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix
index fdf4b5dab44ec..7773844c2febc 100644
--- a/pkgs/development/python-modules/terminado/default.nix
+++ b/pkgs/development/python-modules/terminado/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Terminals served by Tornado websockets";
     homepage = "https://github.com/jupyter/terminado";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/texsoup/default.nix b/pkgs/development/python-modules/texsoup/default.nix
index 697d160adc8e5..86519f929c7e8 100644
--- a/pkgs/development/python-modules/texsoup/default.nix
+++ b/pkgs/development/python-modules/texsoup/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Fault-tolerant Python3 package for searching, navigating, and modifying LaTeX documents";
     homepage = "https://github.com/alvinwan/TexSoup";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix
index 1a370d4595e94..b331d1fdd2f7a 100644
--- a/pkgs/development/python-modules/textdistance/default.nix
+++ b/pkgs/development/python-modules/textdistance/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/life4/textdistance";
     changelog = "https://github.com/life4/textdistance/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix
index 38d07c9f10956..89ba02bf4f258 100644
--- a/pkgs/development/python-modules/textfsm/default.nix
+++ b/pkgs/development/python-modules/textfsm/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     mainProgram = "textfsm";
     homepage = "https://github.com/google/textfsm";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix
index 10d123e08da39..82ebb624d73e4 100644
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/pkgs/development/python-modules/texttable/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/foutaise/texttable";
     changelog = "https://github.com/foutaise/texttable/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix
index 9b548f1a9127b..bdc80d921c048 100644
--- a/pkgs/development/python-modules/threadloop/default.nix
+++ b/pkgs/development/python-modules/threadloop/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Library to run tornado coroutines from synchronous Python";
     homepage = "https://github.com/GoodPete/threadloop";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix
index c30c0a018d21e..e20e1aea09acb 100644
--- a/pkgs/development/python-modules/three-merge/default.nix
+++ b/pkgs/development/python-modules/three-merge/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Simple library for merging two strings with respect to a base one";
     homepage = "https://github.com/spyder-ide/three-merge";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index a02c90152435a..af86c57bae64b 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -3,13 +3,18 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   pdm-backend,
+
+  # dependencies
   huggingface-hub,
-  numpy,
   pyyaml,
   safetensors,
   torch,
   torchvision,
+
+  # checks
   expecttest,
   pytestCheckHook,
   pytest-timeout,
@@ -17,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "timm";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,14 +31,13 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "pytorch-image-models";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0o88gOZvHXblGPwyRIz2D3sD7wdg0J0knrAFlognEOY=";
+    hash = "sha256-z7v1CTwIqdF8xhfGa2mtFi0sFjhOhM7X/q1OQ5qHA7c=";
   };
 
   build-system = [ pdm-backend ];
 
   dependencies = [
     huggingface-hub
-    numpy
     pyyaml
     safetensors
     torch
diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix
index 8d9d2bf4920cf..f525e40d16b96 100644
--- a/pkgs/development/python-modules/tinycss/default.nix
+++ b/pkgs/development/python-modules/tinycss/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://tinycss.readthedocs.io";
     changelog = "https://github.com/Kozea/tinycss/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix
index 813fe48eb0745..b6bd8b10719ce 100644
--- a/pkgs/development/python-modules/titlecase/default.nix
+++ b/pkgs/development/python-modules/titlecase/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     mainProgram = "titlecase";
     homepage = "https://github.com/ppannuto/python-titlecase";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix
index e276725a53a89..9a7eec1354f61 100644
--- a/pkgs/development/python-modules/todoist/default.nix
+++ b/pkgs/development/python-modules/todoist/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Official Todoist Python API library";
     homepage = "https://todoist-python.readthedocs.io/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix
index cda6f1b7a58ef..aca17db0e74e5 100644
--- a/pkgs/development/python-modules/tokenizers/default.nix
+++ b/pkgs/development/python-modules/tokenizers/default.nix
@@ -137,7 +137,7 @@ buildPythonPackage rec {
     description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
     homepage = "https://github.com/huggingface/tokenizers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix
index f7d1a069434a9..12644de66f1e4 100644
--- a/pkgs/development/python-modules/toposort/default.nix
+++ b/pkgs/development/python-modules/toposort/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Topological sort algorithm";
     homepage = "https://pypi.python.org/pypi/toposort/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.asl20;
   };
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 38afe65df6cf2..2a5c06f5ab38e 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -71,6 +71,6 @@ buildPythonPackage rec {
     description = "Web framework and asynchronous networking library";
     homepage = "https://www.tornadoweb.org/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix
index baa2fbe76b214..ae1c3a6016248 100644
--- a/pkgs/development/python-modules/torrent-parser/default.nix
+++ b/pkgs/development/python-modules/torrent-parser/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/7sDream/torrent_parser";
     changelog = "https://github.com/7sDream/torrent_parser/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix
index 6bd00159fd8e0..8f89edf7c496f 100644
--- a/pkgs/development/python-modules/towncrier/default.nix
+++ b/pkgs/development/python-modules/towncrier/default.nix
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/twisted/towncrier/";
     changelog = "https://github.com/twisted/towncrier/blob/${version}/NEWS.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index b143ab8d8563d..fb4da0132f1d5 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -72,6 +72,6 @@ buildPythonPackage rec {
     mainProgram = "tox";
     homepage = "https://github.com/tox-dev/tox";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix
index 024859c6be28f..dd51ff779e2bb 100644
--- a/pkgs/development/python-modules/tracerite/default.nix
+++ b/pkgs/development/python-modules/tracerite/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sanic-org/tracerite";
     changelog = "https://github.com/sanic-org/tracerite/releases/tag/v${version}";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 7ab56f69366d5..a12ffea156bd0 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/soft-matter/trackpy";
     changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = (stdenv.isLinux && stdenv.isAarch64);
   };
 }
diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index e104f762dedc9..f222f9dba2a07 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Explicitly typed attributes for Python";
     homepage = "https://pypi.python.org/pypi/traits";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix
index dfc793888bac7..e00ebe4ce1b77 100644
--- a/pkgs/development/python-modules/traittypes/default.nix
+++ b/pkgs/development/python-modules/traittypes/default.nix
@@ -2,10 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   isPy27,
   pytestCheckHook,
-  nose,
+  setuptools,
   numpy,
   pandas,
   xarray,
@@ -14,47 +13,40 @@
 
 buildPythonPackage rec {
   pname = "traittypes";
-  version = "unstable-2019-06-23";
-  format = "setuptools";
+  version = "0.2.1-unstable-2020-07-17";
+  pyproject = true;
 
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "jupyter-widgets";
     repo = pname;
-    rev = "0a030b928991dec732c17a7a1cb13acbcd7650a2";
-    sha256 = "0rlm5krmq6n8yi47dgdsjyrkz3m079pndpbzkz2gx98pb3jd9pjs";
+    rev = "af2ebeec9e58b73a12d4cf841bd506d6eadb8868";
+    hash = "sha256-q7kt8b+yDHsWML/wCeND9PrZMVjemhzG7Ih1OtHbnTw=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-intarray-test.patch";
-      url = "https://github.com/minrk/traittypes/commit/a02441e5b259e5858453a853207260c9bd4efbb5.patch";
-      sha256 = "120dsvr5nksizw75z1ah3h38mi399fxbvz5anakica557jahi0aw";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace traittypes/tests/test_traittypes.py \
+      --replace-fail "np.int" "int"
+  '';
+
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ traitlets ];
+  dependencies = [ traitlets ];
 
   nativeCheckInputs = [
     numpy
     pandas
     xarray
-    nose
     pytestCheckHook
   ];
 
-  disabledTestPaths = lib.optionals (lib.versionAtLeast numpy.version "1.17") [
-    # https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87
-    "traittypes/tests/test_traittypes.py"
-  ];
-
   pythonImportsCheck = [ "traittypes" ];
 
-  meta = with lib; {
+  meta = {
     description = "Trait types for NumPy, SciPy, XArray, and Pandas";
     homepage = "https://github.com/jupyter-widgets/traittypes";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }
diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix
index fa4cef5acb9c8..2b3e0515894a5 100644
--- a/pkgs/development/python-modules/transaction/default.nix
+++ b/pkgs/development/python-modules/transaction/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://transaction.readthedocs.io/";
     changelog = "https://github.com/zopefoundation/transaction/blob/${version}/CHANGES.rst";
     license = licenses.zpl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 9c090790124ab..1d2a9b15374c7 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/twisted/treq";
     description = "Requests-like API built on top of twisted.web's Agent";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix
index 87bc67368d560..39a9ee4baa4f3 100644
--- a/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/pkgs/development/python-modules/trio-websocket/default.nix
@@ -69,6 +69,6 @@ buildPythonPackage rec {
     description = "WebSocket client and server implementation for Python Trio";
     homepage = "https://github.com/HyperionGray/trio-websocket";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index dc6cc76abb64d..700f97a68b5f2 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -102,6 +102,6 @@ buildPythonPackage rec {
     mainProgram = "ttp";
     homepage = "https://github.com/dmulyalin/ttp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix
index 1d58d87eeb777..3d5384614c3c4 100644
--- a/pkgs/development/python-modules/tubeup/default.nix
+++ b/pkgs/development/python-modules/tubeup/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bibanon/tubeup";
     changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 8449cc2a6f125..b17693c2e0388 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -226,6 +226,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/twisted/twisted";
     description = "Asynchronous networking framework written in Python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/twitch-python/default.nix b/pkgs/development/python-modules/twitch-python/default.nix
index ea16e8927feca..9cf268fc0b645 100644
--- a/pkgs/development/python-modules/twitch-python/default.nix
+++ b/pkgs/development/python-modules/twitch-python/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "Twitch module for Python";
     homepage = "https://github.com/PetterKraabol/Twitch-Python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 60c7f0f444467..6522246a71e12 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/crossbario/txaio";
     changelog = "https://github.com/crossbario/txaio/blob/v${version}/docs/releases.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix
index 98530fb9f413a..aa30df3c3c1cd 100644
--- a/pkgs/development/python-modules/txgithub/default.nix
+++ b/pkgs/development/python-modules/txgithub/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "GitHub API client implemented using Twisted";
     homepage = "https://github.com/tomprince/txgithub";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix
index aeabc80a94259..62b4b5c4ef0d6 100644
--- a/pkgs/development/python-modules/txrequests/default.nix
+++ b/pkgs/development/python-modules/txrequests/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Asynchronous Python HTTP for Humans";
     homepage = "https://github.com/tardyp/txrequests";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index ed9bc62959cc4..2baa87f666fad 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/nexB/typecode";
     changelog = "https://github.com/nexB/typecode/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 68f1a238107e3..9cf7744433028 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Python AST modules with type comment support";
     homepage = "https://github.com/python/typed_ast";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 66f59fb6f0ad0..f093f43f1b8b0 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.com/sscherfke/typed-settings";
     changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 41e7c35791ac7..472b5b882f8ac 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -73,6 +73,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/agronholm/typeguard";
     changelog = "https://github.com/agronholm/typeguard/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix
index 7185845566cbe..78c3cbee88823 100644
--- a/pkgs/development/python-modules/types-appdirs/default.nix
+++ b/pkgs/development/python-modules/types-appdirs/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs.";
     homepage = "https://pypi.org/project/types-appdirs";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix
index dfad6b26d0e47..37b313bc59e95 100644
--- a/pkgs/development/python-modules/types-mock/default.nix
+++ b/pkgs/development/python-modules/types-mock/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     description = "Type stub package for the mock package";
     homepage = "https://pypi.org/project/types-mock";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix
index 8a3f08f8e79a3..2ba7ec577d6d4 100644
--- a/pkgs/development/python-modules/types-psycopg2/default.nix
+++ b/pkgs/development/python-modules/types-psycopg2/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
     description = "Typing stubs for psycopg2";
     homepage = "https://github.com/python/typeshed";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix
index d43ea8e83a6e1..3ed7693ce8874 100644
--- a/pkgs/development/python-modules/typeshed-client/default.nix
+++ b/pkgs/development/python-modules/typeshed-client/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/JelleZijlstra/typeshed_client";
     changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix
index 9d0b250f35bc6..41a4b5147fa9a 100644
--- a/pkgs/development/python-modules/typesystem/default.nix
+++ b/pkgs/development/python-modules/typesystem/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Type system library for Python";
     homepage = "https://github.com/encode/typesystem";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix
index 26e01f033fd95..198df9570b688 100644
--- a/pkgs/development/python-modules/tzdata/default.nix
+++ b/pkgs/development/python-modules/tzdata/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Provider of IANA time zone data";
     homepage = "https://github.com/python/tzdata";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 62741a5a06c1d..0f317a90c36b5 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googlefonts/ufo2ft";
     changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix
index 2cc899002a79f..6eaac11f17f03 100644
--- a/pkgs/development/python-modules/ufolib2/default.nix
+++ b/pkgs/development/python-modules/ufolib2/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     description = "Library to deal with UFO font sources";
     homepage = "https://github.com/fonttools/ufoLib2";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix
index 3e2cb60517929..0dc8fea9bc8ad 100644
--- a/pkgs/development/python-modules/uharfbuzz/default.nix
+++ b/pkgs/development/python-modules/uharfbuzz/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Streamlined Cython bindings for the harfbuzz shaping engine";
     homepage = "https://github.com/harfbuzz/uharfbuzz";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix
index b94550bdce50d..129f731b3caee 100644
--- a/pkgs/development/python-modules/ujson/default.nix
+++ b/pkgs/development/python-modules/ujson/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Ultra fast JSON encoder and decoder";
     homepage = "https://github.com/ultrajson/ultrajson";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 238cc2547a367..6f2039fe23200 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -93,6 +93,6 @@ buildPythonPackage rec {
     description = "Uniform Manifold Approximation and Projection";
     homepage = "https://github.com/lmcinnes/umap";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/undefined/default.nix b/pkgs/development/python-modules/undefined/default.nix
index ccd803bc08027..59cf5c2a84792 100644
--- a/pkgs/development/python-modules/undefined/default.nix
+++ b/pkgs/development/python-modules/undefined/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Ever needed a global object that act as None but not quite?";
     homepage = "https://github.com/Carreau/undefined";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix
index 690db790d7005..a9deef7e2eab3 100644
--- a/pkgs/development/python-modules/unittest-data-provider/default.nix
+++ b/pkgs/development/python-modules/unittest-data-provider/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "PHPUnit-like @dataprovider decorator for unittest";
     homepage = "https://github.com/yourlabs/unittest-data-provider";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix
index 79d2e4389ac6c..7e82256d39178 100644
--- a/pkgs/development/python-modules/upass/default.nix
+++ b/pkgs/development/python-modules/upass/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     mainProgram = "upass";
     homepage = "https://github.com/Kwpolska/upass";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/uri-template/default.nix b/pkgs/development/python-modules/uri-template/default.nix
index e37fd44391483..27f91bad92c90 100644
--- a/pkgs/development/python-modules/uri-template/default.nix
+++ b/pkgs/development/python-modules/uri-template/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Implementation of RFC 6570 URI Templates";
     homepage = "https://github.com/plinss/uri_template/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index af4c3579e184c..7c2024af44d8f 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -81,6 +81,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/urwid/urwid";
     homepage = "https://urwid.org/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix
index 0f03b4fdbc4ea..c50502c3df549 100644
--- a/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/pkgs/development/python-modules/urwidtrees/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pazz/urwidtrees";
     changelog = "https://github.com/pazz/urwidtrees/releases/tag/${version}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix
index 1aa4d2bc8d18a..b42c5c8f6aa19 100644
--- a/pkgs/development/python-modules/us/default.nix
+++ b/pkgs/development/python-modules/us/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/unitedstates/python-us/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix
index eba36519accaa..3b4cd7a0bd233 100644
--- a/pkgs/development/python-modules/ush/default.nix
+++ b/pkgs/development/python-modules/ush/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Powerful API for invoking with external commands";
     homepage = "https://github.com/tarruda/python-ush";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 4f2ff7d11ceae..905a923dc7bf2 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -99,6 +99,6 @@ buildPythonPackage rec {
     description = "Fast implementation of asyncio event loop on top of libuv";
     homepage = "https://github.com/MagicStack/uvloop";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 920a439d33799..20d4e7b46359a 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -51,6 +51,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kevin1024/vcrpy";
     changelog = "https://github.com/kevin1024/vcrpy/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/verspec/default.nix b/pkgs/development/python-modules/verspec/default.nix
index fe30ab8bebf97..2da64ec5f653a 100644
--- a/pkgs/development/python-modules/verspec/default.nix
+++ b/pkgs/development/python-modules/verspec/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
       bsd2 # and
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix
index 2e1e864cb81bb..056e38a32923b 100644
--- a/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/pkgs/development/python-modules/virtualenv-clone/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Script to clone virtualenvs";
     mainProgram = "virtualenv-clone";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix
index 87c286c8e3425..8bab0d88fe4a7 100644
--- a/pkgs/development/python-modules/visitor/default.nix
+++ b/pkgs/development/python-modules/visitor/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mbr/visitor";
     description = "Tiny pythonic visitor implementation";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix
index 81f6553a96469..db8692e77b06e 100644
--- a/pkgs/development/python-modules/vobject/default.nix
+++ b/pkgs/development/python-modules/vobject/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Module for reading vCard and vCalendar files";
     homepage = "http://eventable.github.io/vobject/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/vsts-cd-manager/default.nix b/pkgs/development/python-modules/vsts-cd-manager/default.nix
index 8730f6e0ef2a8..94ebbbe5e4a37 100644
--- a/pkgs/development/python-modules/vsts-cd-manager/default.nix
+++ b/pkgs/development/python-modules/vsts-cd-manager/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "Microsoft Azure API Management Client Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix
index c3a3d38b98b76..6c339204f3dc8 100644
--- a/pkgs/development/python-modules/vsts/default.nix
+++ b/pkgs/development/python-modules/vsts/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Python APIs for interacting with and managing Azure DevOps";
     homepage = "https://github.com/microsoft/azure-devops-python-api";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/vtjp/default.nix b/pkgs/development/python-modules/vtjp/default.nix
index cfc0aaf1b9069..76661675f6818 100644
--- a/pkgs/development/python-modules/vtjp/default.nix
+++ b/pkgs/development/python-modules/vtjp/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Miicroo/python-vasttrafik";
     changelog = "https://github.com/Miicroo/python-vasttrafik/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix
index 2fa0ee811737d..620f30f2508f5 100644
--- a/pkgs/development/python-modules/w3lib/default.nix
+++ b/pkgs/development/python-modules/w3lib/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/scrapy/w3lib";
     changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix
index cfe32849b5396..e43688e526ad9 100644
--- a/pkgs/development/python-modules/warlock/default.nix
+++ b/pkgs/development/python-modules/warlock/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Python object model built on JSON schema and JSON patch";
     homepage = "https://github.com/bcwaldon/warlock";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index 5081be3853d57..290e4faec0147 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ines/wasabi";
     changelog = "https://github.com/ines/wasabi/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix
new file mode 100644
index 0000000000000..7ea81661648f6
--- /dev/null
+++ b/pkgs/development/python-modules/wat/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  nuclear,
+  pydantic,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "wat";
+  version = "0.1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "igrek51";
+    repo = "wat";
+    rev = version;
+    hash = "sha256-ibbWM2L/GoJVg8RxtsBSBn/qA+KIkC5+wq5YH6mtiUs=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    nuclear
+    pydantic
+  ];
+  pythonImportsCheck = [ "wat" ];
+
+  meta = with lib; {
+    homepage = "https://igrek51.github.io/wat/";
+    description = "Deep inspection of python objects";
+    license = licenses.mit;
+    maintainers = with maintainers; [ parras ];
+  };
+}
diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix
index 34383f549f999..fb7328d5c34f6 100644
--- a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix
+++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Library for computing contrast ratios, as required by WCAG 2.0";
     homepage = "https://github.com/gsnedders/wcag-contrast-ratio";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix
index 90c83d35964f3..ad6225e4cb6a4 100644
--- a/pkgs/development/python-modules/wcmatch/default.nix
+++ b/pkgs/development/python-modules/wcmatch/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Wilcard File Name matching library";
     homepage = "https://github.com/facelessuser/wcmatch";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix
index 27a3bac5d7d11..c79af7be6b5ab 100644
--- a/pkgs/development/python-modules/wcwidth/default.nix
+++ b/pkgs/development/python-modules/wcwidth/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/jquast/wcwidth";
     changelog = "https://github.com/jquast/wcwidth/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix
index af0621ad54d44..f747271881666 100644
--- a/pkgs/development/python-modules/webauthn/default.nix
+++ b/pkgs/development/python-modules/webauthn/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/duo-labs/py_webauthn";
     changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix
index 2cd7fed14103d..93f2030755c04 100644
--- a/pkgs/development/python-modules/webcolors/default.nix
+++ b/pkgs/development/python-modules/webcolors/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "Library for working with color names/values defined by the HTML and CSS specifications";
     homepage = "https://github.com/ubernostrum/webcolors";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix
deleted file mode 100644
index 4b7c9c3674246..0000000000000
--- a/pkgs/development/python-modules/webhelpers/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  routes,
-  markupsafe,
-  webob,
-  nose,
-}:
-
-buildPythonPackage rec {
-  pname = "webhelpers";
-  version = "1.3";
-
-  src = fetchPypi {
-    pname = "WebHelpers";
-    inherit version;
-    sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583";
-  };
-
-  buildInputs = [
-    routes
-    markupsafe
-    webob
-    nose
-  ];
-
-  # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://webhelpers.readthedocs.org/en/latest/";
-    description = "Web Helpers";
-    license = licenses.free;
-    maintainers = with maintainers; [ domenkozar ];
-  };
-}
diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 05eeb73844b2a..e574d78da108e 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     description = "WSGI request and response object";
     homepage = "https://webob.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix
index fc1b3c7115188..2dee5231dc723 100644
--- a/pkgs/development/python-modules/websockify/default.nix
+++ b/pkgs/development/python-modules/websockify/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kanaka/websockify";
     changelog = "https://github.com/novnc/websockify/releases/tag/v${version}";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wheezy-template/default.nix b/pkgs/development/python-modules/wheezy-template/default.nix
index fd88225ee69af..fcdaf64d802ca 100644
--- a/pkgs/development/python-modules/wheezy-template/default.nix
+++ b/pkgs/development/python-modules/wheezy-template/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     description = "Lightweight template library";
     mainProgram = "wheezy.template";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
index a47c58b1adffa..cc595dbc789c3 100644
--- a/pkgs/development/python-modules/whitenoise/default.nix
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -55,6 +55,6 @@ buildPythonPackage rec {
     homepage = "https://whitenoise.readthedocs.io/";
     changelog = "https://github.com/evansd/whitenoise/blob/${version}/docs/changelog.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix
index fbe8528c0cf28..b56a590a3fa6d 100644
--- a/pkgs/development/python-modules/whoosh/default.nix
+++ b/pkgs/development/python-modules/whoosh/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Fast, pure-Python full text indexing, search, and spell checking library";
     homepage = "https://github.com/mchaput/whoosh";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix
index caaa6d1c995ab..b4c636923b963 100644
--- a/pkgs/development/python-modules/wrapt/default.nix
+++ b/pkgs/development/python-modules/wrapt/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Module for decorators, wrappers and monkey patching";
     homepage = "https://github.com/GrahamDumpleton/wrapt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix
index fb53253c8c63c..4cb6bacc3c932 100644
--- a/pkgs/development/python-modules/ws4py/default.nix
+++ b/pkgs/development/python-modules/ws4py/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://ws4py.readthedocs.org";
     changelog = "https://github.com/Lawouach/WebSocket-for-Python/blob/${version}/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index 92d7f79082a24..880e10b59d7fc 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Pure Python, pure state-machine WebSocket implementation";
     homepage = "https://github.com/python-hyper/wsproto/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix
index d71ba1adca232..ea46539a5db5e 100644
--- a/pkgs/development/python-modules/wurlitzer/default.nix
+++ b/pkgs/development/python-modules/wurlitzer/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/minrk/wurlitzer";
     changelog = "https://github.com/minrk/wurlitzer/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index 58981027b3e8c..743e7b068bc5f 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://xapian.org/";
     changelog = "https://xapian.org/docs/xapian-bindings-${version}/NEWS";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix
index e700a0a80d64b..84a9d63536e00 100644
--- a/pkgs/development/python-modules/xattr/default.nix
+++ b/pkgs/development/python-modules/xattr/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/xattr/xattr";
     changelog = "https://github.com/xattr/xattr/blob/v${version}/CHANGES.txt";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix
index 87eeec7902ea8..4a2efae3a8fb8 100644
--- a/pkgs/development/python-modules/xdg/default.nix
+++ b/pkgs/development/python-modules/xdg/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "XDG Base Directory Specification for Python";
     homepage = "https://github.com/srstevenson/xdg";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index 1ab72c73a81be..eeb1b6ce33738 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
     changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "xhtml2pdf";
   };
 }
diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix
index 97672413a4ddd..1110fcbb634ec 100644
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/pkgs/development/python-modules/xlib/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     description = "Fully functional X client library for Python programs";
     homepage = "https://github.com/python-xlib/python-xlib";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 13829b6be86c2..a78654265c531 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sissaschool/xmlschema";
     changelog = "https://github.com/sissaschool/xmlschema/blob/${src.rev}/CHANGELOG.rst";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix
index 9a6142501630d..0000eea5f4058 100644
--- a/pkgs/development/python-modules/xmltodict/default.nix
+++ b/pkgs/development/python-modules/xmltodict/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Makes working with XML feel like you are working with JSON";
     homepage = "https://github.com/martinblech/xmltodict";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xmod/default.nix b/pkgs/development/python-modules/xmod/default.nix
index e16652e971f5d..34b197579c3eb 100644
--- a/pkgs/development/python-modules/xmod/default.nix
+++ b/pkgs/development/python-modules/xmod/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/rec/xmod";
     changelog = "https://github.com/rec/xmod/blob/${src.rev}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix
index 33a4732fdebf9..b1f4a0caa6522 100644
--- a/pkgs/development/python-modules/yamlordereddictloader/default.nix
+++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "YAML loader and dump for PyYAML allowing to keep keys order";
     homepage = "https://github.com/fmenabe/python-yamlordereddictloader";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix
index c623097a6d5fa..3883e3fa54f4b 100644
--- a/pkgs/development/python-modules/yangson/default.nix
+++ b/pkgs/development/python-modules/yangson/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
       gpl3Plus
       lgpl3Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix
index 30143e8a90fa1..c1a0a6cc900f1 100644
--- a/pkgs/development/python-modules/yark/default.nix
+++ b/pkgs/development/python-modules/yark/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Owez/yark";
     changelog = "https://github.com/Owez/yark/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix
index f5a87425a0757..bbf2a0605cc26 100644
--- a/pkgs/development/python-modules/yattag/default.nix
+++ b/pkgs/development/python-modules/yattag/default.nix
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     description = "Library to generate HTML or XML";
     homepage = "https://www.yattag.org/";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix
index b9eeabea51fee..344427e53e168 100644
--- a/pkgs/development/python-modules/youtube-search-python/default.nix
+++ b/pkgs/development/python-modules/youtube-search-python/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Search for YouTube videos, channels & playlists & get video information using link without YouTube Data API";
     homepage = "https://github.com/alexmercerind/youtube-search-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index dfe6cbf51f73b..b95a996f7683f 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -50,6 +50,6 @@ buildPythonPackage rec {
     description = "Python WhatsApp library";
     mainProgram = "yowsup-cli";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index cf4f33fdaca0c..4d99219d05a20 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -4,28 +4,24 @@
   fetchFromGitHub,
   pythonOlder,
   requests,
-  setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "1.7.5";
+  version = "1.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "sigma67";
     repo = "ytmusicapi";
     rev = "refs/tags/${version}";
-    hash = "sha256-hj2pGT35LCotR96WnyyyRVEiixwru57e3gPhL8tptfk=";
+    hash = "sha256-PuGGUyQ199Awo0Dqi6xUAAt53WZjvaLiW7bIT4zlMT0=";
   };
 
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
+  build-system = [ setuptools-scm ];
 
   dependencies = [ requests ];
 
diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index 9022a3aaeb692..131aef003b2dd 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zarr-developers/zarr";
     changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 358a475f6fcf7..01101670ef548 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.20";
+  version = "0.0.23";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     rev = "refs/tags/${version}";
-    hash = "sha256-kmTOWHREdzXfgDPPs91GfQCgpmkUshwGtscOTT1WGns=";
+    hash = "sha256-a0rr8pJCoVtDR3iNCDpLZnapetzNHMj8uCu667lNcGE=";
   };
 
   postPatch = ''
@@ -102,6 +102,12 @@ buildPythonPackage rec {
     "test_sinope_time"
     "test_siren_timed_off"
     "test_zha_group_light_entity"
+    # flaky, either due to race conditions or timeouts
+    "test_zha_group_switch_entity"
+    "test_zha_group_fan_entity"
+    "test_startup_concurrency_limit"
+    "test_fan_ikea"
+    "test_background"
   ];
 
   disabledTestPaths = [ "tests/test_cluster_handlers.py" ];
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index b39bba71ddfd1..db54562417f00 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.64.3";
+  version = "0.65.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-bFCQAobzYdEFjr4dE2ANj6uHnhGzxz+Ij7wMT/nMH4I=";
+    hash = "sha256-CyVmMDZ+8B3SYRR6JKFeI/dyQbJk70/slm3hRV1f3ig=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix
index f9ecaecd95e38..07185aa568f4a 100644
--- a/pkgs/development/python-modules/zipp/default.nix
+++ b/pkgs/development/python-modules/zipp/default.nix
@@ -43,7 +43,7 @@ let
       description = "Pathlib-compatible object wrapper for zip files";
       homepage = "https://github.com/jaraco/zipp";
       license = licenses.mit;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 in
diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index 55dcfb7800d96..e9d90b93e4b95 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zopefoundation/zodbpickle";
     changelog = "https://github.com/zopefoundation/zodbpickle/blob/${version}/CHANGES.rst";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/attrs/default.nix b/pkgs/development/python2-modules/attrs/default.nix
index f4b4b505721f5..e894ee27d3fb3 100644
--- a/pkgs/development/python2-modules/attrs/default.nix
+++ b/pkgs/development/python2-modules/attrs/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Python attributes without boilerplate";
     homepage = "https://github.com/hynek/attrs";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/futures/default.nix b/pkgs/development/python2-modules/futures/default.nix
index bc19a31927af1..d1cdb679d0d1e 100644
--- a/pkgs/development/python2-modules/futures/default.nix
+++ b/pkgs/development/python2-modules/futures/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "Backport of the concurrent.futures package from Python 3.2";
     homepage = "https://github.com/agronholm/pythonfutures";
     license = licenses.bsd2;
-    maintainers = with maintainers; [  ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/pluggy/default.nix b/pkgs/development/python2-modules/pluggy/default.nix
index 30fa2e1945b21..ea362bdb5812f 100644
--- a/pkgs/development/python2-modules/pluggy/default.nix
+++ b/pkgs/development/python2-modules/pluggy/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     description = "Plugin and hook calling mechanisms for Python";
     homepage = "https://github.com/pytest-dev/pluggy";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix
index 2a09002976b23..00c98fba39aff 100644
--- a/pkgs/development/python2-modules/pygobject/default.nix
+++ b/pkgs/development/python2-modules/pygobject/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     homepage = "https://pygobject.readthedocs.io/";
     description = "Python bindings for GLib";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python2-modules/setuptools-scm/default.nix b/pkgs/development/python2-modules/setuptools-scm/default.nix
index 6b5aafcd3c4b8..48b6d3b813473 100644
--- a/pkgs/development/python2-modules/setuptools-scm/default.nix
+++ b/pkgs/development/python2-modules/setuptools-scm/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/pypa/setuptools_scm/";
     description = "Handles managing your python package versions in scm metadata";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 84d0bf21ce34b..a541a8ee34bde 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -17,11 +17,11 @@
 # This separates "what to build" (the exact gem versions) from "how to build"
 # (to make gems behave if necessary).
 
-{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
+{ lib, fetchurl, fetchpatch2, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
 , libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem
 , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
 , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl
-, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem
+, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, lerc, buildRubyGem
 , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
 , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook3, atk
@@ -126,7 +126,16 @@ in
   };
 
   curses = attrs: {
+    dontBuild = false;
     buildInputs = [ ncurses ];
+    patches = lib.optionals (lib.versionOlder attrs.version "1.4.5") [
+      # Fixes incompatible function pointer type error with clang 16. Fixed in 1.4.5 and newer.
+      # Upstream issue: https://github.com/ruby/curses/issues/85
+      (fetchpatch2 {
+        url = "https://github.com/ruby/curses/commit/13e00d07c3aaed83d5f138cf268cc33c9f025d0e.patch?full_index=1";
+        hash = "sha256-ZJ2egqj3Uwmi4KrF79dtwczpwUqFCp52/xQYUymYDmc=";
+      })
+    ];
   };
 
   dep-selector-libgecode = attrs: {
@@ -379,6 +388,7 @@ in
       gtk3
       cairo
       harfbuzz
+      lerc
       libdatrie
       libthai
       pcre
@@ -447,9 +457,20 @@ in
     buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
   };
 
+  hpricot = attrs: {
+    dontBuild = false;
+    patches = [
+      # Fix incompatible function pointer conversion errors with clang 16
+      ./hpricot-fix-incompatible-function-pointer-conversion.patch
+    ];
+  };
+
   iconv = attrs: {
     dontBuild = false;
-    buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
+    buildFlags = lib.optionals stdenv.isDarwin [
+      "--with-iconv-dir=${lib.getLib libiconv}"
+      "--with-iconv-include=${lib.getDev libiconv}/include"
+    ];
     patches = [
       # Fix incompatible function pointer conversion errors with clang 16
       ./iconv-fix-incompatible-function-pointer-conversions.patch
@@ -504,8 +525,8 @@ in
       "--with-xml2-lib=${libxml2.out}/lib"
       "--with-xml2-include=${libxml2.dev}/include/libxml2"
     ] ++ lib.optionals stdenv.isDarwin [
-      "--with-iconv-dir=${libiconv}"
-      "--with-opt-include=${libiconv}/include"
+      "--with-iconv-dir=${lib.getLib libiconv}"
+      "--with-opt-include=${lib.getDev libiconv}/include"
     ];
   };
 
diff --git a/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch
new file mode 100644
index 0000000000000..1a4a0b55c20de
--- /dev/null
+++ b/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch
@@ -0,0 +1,48 @@
+diff --git a/ext/fast_xs/fast_xs.c b/ext/fast_xs/fast_xs.c
+index 11ef71f..d5eb8d8 100644
+--- a/ext/fast_xs/fast_xs.c
++++ b/ext/fast_xs/fast_xs.c
+@@ -144,7 +144,7 @@ static VALUE unpack_utf8(VALUE self)
+ 	return rb_funcall(self, unpack_id, 1, U_fmt);
+ }
+ 
+-static VALUE unpack_uchar(VALUE self)
++static VALUE unpack_uchar(VALUE self, VALUE _exn)
+ {
+ 	return rb_funcall(self, unpack_id, 1, C_fmt);
+ }
+diff --git a/ext/hpricot_scan/hpricot_scan.c b/ext/hpricot_scan/hpricot_scan.c
+index f11cbb5..161ebd4 100644
+--- a/ext/hpricot_scan/hpricot_scan.c
++++ b/ext/hpricot_scan/hpricot_scan.c
+@@ -22,7 +22,7 @@ struct hpricot_struct {
+ #define RSTRING_PTR(str) RSTRING(str)->ptr
+ #endif
+ 
+-VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE, VALUE);
++VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE);
+ 
+ #define NO_WAY_SERIOUSLY "*** This should not happen, please file a bug report with the HTML you're parsing at http://github.com/hpricot/hpricot/issues.  So sorry!"
+ 
+diff --git a/ext/hpricot_scan/hpricot_scan.rl b/ext/hpricot_scan/hpricot_scan.rl
+index 0f17f11..8b00a38 100644
+--- a/ext/hpricot_scan/hpricot_scan.rl
++++ b/ext/hpricot_scan/hpricot_scan.rl
+@@ -20,7 +20,7 @@ struct hpricot_struct {
+ #define RSTRING_PTR(str) RSTRING(str)->ptr
+ #endif
+ 
+-VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE, VALUE);
++VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE);
+ 
+ #define NO_WAY_SERIOUSLY "*** This should not happen, please file a bug report with the HTML you're parsing at http://github.com/hpricot/hpricot/issues.  So sorry!"
+ 
+@@ -806,7 +806,7 @@ make_hpricot_struct(VALUE members, VALUE (*alloc)(VALUE klass))
+   for (i = 0; i < len; i++) {
+     ID id = SYM2ID(rb_ary_entry(members, i));
+     const char* name = rb_id2name(id);
+-    int len = strlen(name);
++    size_t len = strlen(name);
+ 
+     memcpy(attr_set, name, strlen(name));
+     attr_set[len] = '=';
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 099e4f7c6026b..e2ac6ed6628ee 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.208";
+  version = "3.2.209";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-bCaqwgFG/bHy9nWYKqiGMoeXvE9bTc5QZmtp3rDOkUk=";
+    hash = "sha256-kAsSLpm6LxPTief8WSnFDrkyOPT7GeUP9Btv4JfveW4=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index 8143a6bfd58e4..27c11ffb2eaa9 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.18.0";
+  version = "2.18.1";
 
   dontConfigure = true;
   dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-wmBsPSwuFUnipLodxtr9xGhWKjBrn3NQ/X1QpxvlRf4=";
+    hash = "sha256-X/Sg5+UGl0DJ5LL42tlQt3NIfTJc4nH1AySeLJQsZkk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index 93a74f2b4a6a7..b55e8c5bcfa41 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Semantic analysis tool for C";
     homepage = "https://sparse.docs.kernel.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index 4e2af64c607bd..706d3f6b8edb0 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
 
     # https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix
index 41f1af56422c3..cb10603e9bd04 100644
--- a/pkgs/development/tools/analysis/snyk/default.nix
+++ b/pkgs/development/tools/analysis/snyk/default.nix
@@ -39,7 +39,7 @@ buildNpmPackage rec {
     homepage = "https://snyk.io";
     changelog = "https://github.com/snyk/cli/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "snyk";
   };
 }
diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix
index ab2b971683bc5..8de60ad396124 100644
--- a/pkgs/development/tools/analysis/stylelint/default.nix
+++ b/pkgs/development/tools/analysis/stylelint/default.nix
@@ -20,6 +20,6 @@ buildNpmPackage rec {
     mainProgram = "stylelint";
     homepage = "https://stylelint.io";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix
index 7ee16a2972e13..9615d4574cdb2 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/development/tools/avro-tools/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     mainProgram = "avro-tools";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license     = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 7f2fb6daeaf74..1393a7ca54e99 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/google/bloaty";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix
index 1b977e33027b2..e870371c0ebe4 100644
--- a/pkgs/development/tools/bloom/default.nix
+++ b/pkgs/development/tools/bloom/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     description = "Debug interface for AVR-based embedded systems development on GNU/Linux";
     homepage = "https://bloom.oscillate.io/";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "bloom";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index d173403e3dea7..99421a2bd6c50 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -33,6 +33,6 @@ mkDerivation rec {
     homepage = "https://github.com/BoomerangDecompiler/boomerang";
     license = licenses.bsd3;
     description = "General, open source, retargetable decompiler";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 7567b3e3dba10..1522411656cd4 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -211,6 +211,7 @@ rec {
       passthru = {
         fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
         inherit (gradle) jdk;
+        unwrapped = gradle;
       };
 
       meta = gradle.meta // {
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 4c10652d678fa..efbce0bcd3391 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.epl10;
     platforms = jdk.meta.platforms;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lein";
   };
 }
diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix
index 9b745264eb9c5..184c038beae4a 100644
--- a/pkgs/development/tools/build-managers/xmake/default.nix
+++ b/pkgs/development/tools/build-managers/xmake/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xmake";
-  version = "2.9.3";
+  version = "2.9.4";
 
   src = fetchurl {
     url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
-    hash = "sha256-gqm7aWGjm+qPKAwUE9VIVEI/j5Li/0PuHA/q16O17dg=";
+    hash = "sha256-deLd4r0qSKMymJuAGuZQd8RS1JH+xRep2yeoHIcTzcU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix
index d524da13cfac9..43279049ea0df 100644
--- a/pkgs/development/tools/bundletool/default.nix
+++ b/pkgs/development/tools/bundletool/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://developer.android.com/studio/command-line/bundletool";
     changelog = "https://github.com/google/bundletool/releases/tag/${version}";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = jre_headless.meta.platforms;
     license = licenses.asl20;
   };
diff --git a/pkgs/development/tools/clean-css-cli/default.nix b/pkgs/development/tools/clean-css-cli/default.nix
index 2f0cd241ecbe9..62782c311d629 100644
--- a/pkgs/development/tools/clean-css-cli/default.nix
+++ b/pkgs/development/tools/clean-css-cli/default.nix
@@ -24,6 +24,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/clean-css/clean-css-cli";
     license = lib.licenses.mit;
     mainProgram = "cleancss";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index 8bd22b537196a..9d516ebe4eb45 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -39,6 +39,6 @@ buildGoModule rec {
     mainProgram = "cloud-nuke";
     changelog = "https://github.com/gruntwork-io/cloud-nuke/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix
index 0131a5029060f..ed4cde502a5c8 100644
--- a/pkgs/development/tools/cloudsmith-cli/default.nix
+++ b/pkgs/development/tools/cloudsmith-cli/default.nix
@@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Cloudsmith Command Line Interface";
     mainProgram = "cloudsmith";
     changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
     platforms = with platforms; unix;
   };
diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix
index aae8fb39722c3..7c604e7112039 100644
--- a/pkgs/development/tools/cocogitto/default.nix
+++ b/pkgs/development/tools/cocogitto/default.nix
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "cog";
     homepage = "https://github.com/oknozor/cocogitto";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
index f18865a7cee52..65ae92d90479a 100644
--- a/pkgs/development/tools/compile-daemon/default.nix
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Very simple compile daemon for Go";
     homepage = "https://github.com/githubnemo/CompileDaemon";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "CompileDaemon";
   };
 }
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
index e77aecde510f3..05347f153c7a4 100644
--- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
   vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k=";
 
   meta = with lib; {
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.unfreeRedistributable;
     homepage = "https://github.com/drone-runners/drone-runner-docker";
     description = "Drone pipeline runner that executes builds inside Docker containers";
diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix
index f0b45f8a50f65..628a9cefb041c 100644
--- a/pkgs/development/tools/cpm-cmake/default.nix
+++ b/pkgs/development/tools/cpm-cmake/default.nix
@@ -5,13 +5,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cpm-cmake";
-  version = "0.40.0";
+  version = "0.40.1";
 
   src = fetchFromGitHub {
     owner = "cpm-cmake";
     repo = "cpm.cmake";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-307U/7gO8Ps5UvslYGOrVKHRjO9TYJrYsnAzu0Kljt8=";
+    hash = "sha256-9yXBk0j9SNdQ+V2RVWhPlOXaX/S7OQDEVdnb2XehT9E=";
   };
 
   dontConfigure = true;
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       simple API and more.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix
index 24d3fa7417814..2cf15193c050f 100644
--- a/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/pkgs/development/tools/database/prisma-engines/default.nix
@@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://www.prisma.io/";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ pimeys tomhoule ivan aqrln ];
+    maintainers = with maintainers; [ pimeys tomhoule aqrln ];
   };
 }
 
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
index 3e7e640c88b59..797ee27eeeb2b 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     mainProgram = "shmig";
     homepage = "https://github.com/mbucc/shmig";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix
index 121ccee544ad0..32458926bd00e 100644
--- a/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/pkgs/development/tools/database/timescaledb-tune/default.nix
@@ -20,6 +20,6 @@ buildGoModule rec {
     mainProgram = "timescaledb-tune";
     homepage = "https://github.com/timescale/timescaledb-tune";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix
index 5d654b58a1ef6..0d30fc4f38002 100644
--- a/pkgs/development/tools/djhtml/default.nix
+++ b/pkgs/development/tools/djhtml/default.nix
@@ -23,6 +23,6 @@ buildPythonApplication rec {
     homepage = "https://github.com/rtts/djhtml";
     description = "Django/Jinja template indenter";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix
index d2b69af76ed13..e14437b08b24e 100644
--- a/pkgs/development/tools/drm_info/default.nix
+++ b/pkgs/development/tools/drm_info/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     mainProgram = "drm_info";
     homepage = "https://github.com/ascent12/drm_info";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 01b29e15ed2fb..2a5d1f400cda5 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,13 +23,13 @@
     },
     "31": {
         "hashes": {
-            "aarch64-darwin": "6335fb15beeaaa6601a325a9b616b059a289063fc560ff66efd5353d4ab4fcbe",
-            "aarch64-linux": "de793d036dbce9dbda8603992db8d57d40e37f97ee9bc5808fcb5ec492cb1e10",
-            "armv7l-linux": "fe4ab8af208fd5d882c9b1cc25f33a0816a6eec4d75f0911b8fa320e9c8cadcc",
-            "headers": "00i9y8ya03drd5hdhv1pmlai66bjmh04zfc39g65skbgz9yjihmj",
-            "x86_64-darwin": "5423016c84cde9513ace0d68d06fecd376ab945bae22e2cb39eaf2a6e83813a8",
-            "x86_64-linux": "70182bd0980458607ed7d1684ded9de88bfd00793e680bb23b9cef595a24a5d6"
+            "aarch64-darwin": "b2e85d41607d09d7645ca58c0243c8f00e15dcbe32f4ceeab9566235eadc7143",
+            "aarch64-linux": "8ab96b6db830746a026b9eb4233ff51577b1880f5595a65aa38edd593e700f7e",
+            "armv7l-linux": "e9cdc7e9d055a90932c2c739112bf89f85afe3125f72b8ae1ddb0eab3edcace2",
+            "headers": "0bjhrhv9310kwl7q2klr7awwgjiwfhiycm59c5kzgh7wj221ll1v",
+            "x86_64-darwin": "5b2b7426c735a4979acb4e341256ab2342b85e3bf42b9da0ba9780d21f0bda6b",
+            "x86_64-linux": "9feeaac10629f79334ef14a668f653b2fda09fbf0fa1019c3a58d7e1d79c1d1a"
         },
-        "version": "31.2.0"
+        "version": "31.3.0"
     }
 }
diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix
index ff2af4cc5aae2..b056718f63058 100644
--- a/pkgs/development/tools/firebase-tools/default.nix
+++ b/pkgs/development/tools/firebase-tools/default.nix
@@ -39,6 +39,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/firebase/firebase-tools";
     license = lib.licenses.mit;
     mainProgram = "firebase";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/development/tools/frece/default.nix
index 6e872aa2a6cc1..c8bc63e3dcb72 100644
--- a/pkgs/development/tools/frece/default.nix
+++ b/pkgs/development/tools/frece/default.nix
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/YodaEmbedding/frece";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index 457895c061649..3b754db80fd89 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     homepage = "https://github.com/SRI-CSL/gllvm";
     description = "Whole Program LLVM: wllvm ported to go";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 3b0bd53e4867d..7877313b9d50c 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md";
     description = "Small utility which generates Go code from any file, useful for embedding binary data in a Go program";
     mainProgram = "go-bindata";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.cc0;
   };
 }
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index 626276a40c3aa..79ec969e88f9e 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -5,15 +5,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.17.2";
+  version = "3.18.0";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    hash = "sha256-1ONgo7l2zHOyCFKa13R2zxUiD16aEQQTKVJex+P9fUM=";
+    hash = "sha256-hteD8wxpkw27tduBUYkCIE+vgN/ggkIezEgFWqSuxbo=";
   };
-  vendorHash = "sha256-2aAOM8v2LOZOBfCjnUGN3frJloabmj5fBMpZxMHVFmk=";
+  vendorHash = "sha256-AwpPuj/nX8MD//JL/oF+RGGQi1fdUo28KII2+y5Ptso=";
 
   subPackages = [ "cmd/goa" ];
 
diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/development/tools/gotest/default.nix
index 172d2eb12edfe..2f54241d651d3 100644
--- a/pkgs/development/tools/gotest/default.nix
+++ b/pkgs/development/tools/gotest/default.nix
@@ -20,6 +20,6 @@ buildGoModule rec {
     mainProgram = "gotest";
     homepage = "https://github.com/rakyll/gotest";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix
index 342cc4009edf4..11d9cf11b1525 100644
--- a/pkgs/development/tools/hotdoc/default.nix
+++ b/pkgs/development/tools/hotdoc/default.nix
@@ -121,6 +121,6 @@ buildPythonApplication rec {
     description = "Tastiest API documentation system";
     homepage = "https://hotdoc.github.io/";
     license = [ licenses.lgpl21Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/htmlhint/default.nix b/pkgs/development/tools/htmlhint/default.nix
index 162bb82b28cfc..6d70819515d14 100644
--- a/pkgs/development/tools/htmlhint/default.nix
+++ b/pkgs/development/tools/htmlhint/default.nix
@@ -22,6 +22,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/htmlhint/HTMLHint";
     license = lib.licenses.mit;
     mainProgram = "htmlhint";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix
index cffc417d7cb98..8dd3cf1299cb7 100644
--- a/pkgs/development/tools/kafka-delta-ingest/default.nix
+++ b/pkgs/development/tools/kafka-delta-ingest/default.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "kafka-delta-ingest";
     homepage = "https://github.com/delta-io/kafka-delta-ingest";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/karma-runner/default.nix b/pkgs/development/tools/karma-runner/default.nix
index d05d0e7e3969a..514d789ac6787 100644
--- a/pkgs/development/tools/karma-runner/default.nix
+++ b/pkgs/development/tools/karma-runner/default.nix
@@ -27,6 +27,6 @@ buildNpmPackage rec {
     homepage = "http://karma-runner.github.io/";
     license = lib.licenses.mit;
     mainProgram = "karma";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
index af7775f57246f..19ff79c332aba 100644
--- a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "kotlin-language-server";
-  version = "1.3.9";
+  version = "1.3.12";
   src = fetchzip {
     url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
-    hash = "sha256-4piXggWK/BXDXrgkvJisaO5nOs72cvU1F47rKy4z+rc=";
+    hash = "sha256-poWaU0vZS1cpMbbvN7/s1RRUKhekdfTi08fF/IZsVGs=";
   };
 
   dontBuild = true;
diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix
index 6ff7bb4c11ec6..36e78863deb6c 100644
--- a/pkgs/development/tools/language-servers/millet/default.nix
+++ b/pkgs/development/tools/language-servers/millet/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/azdavis/millet";
     changelog = "https://github.com/azdavis/millet/blob/v${version}/docs/CHANGELOG.md";
     license = [ licenses.mit /* or */ licenses.asl20 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "millet-ls";
   };
 }
diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix
index 1642d495b1d88..408bb69f64b6e 100644
--- a/pkgs/development/tools/language-servers/zls/default.nix
+++ b/pkgs/development/tools/language-servers/zls/default.nix
@@ -1,28 +1,28 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, zig_0_12
+, zig_0_13
 , callPackage
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zls";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "zigtools";
     repo = "zls";
     rev = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-2iVDPUj9ExgTooDQmCCtZs3wxBe2be9xjzAk9HedPNY=";
+    hash = "sha256-vkFGoKCYUk6B40XW2T/pdhir2wzN1kpFmlLcoLwJx1U=";
   };
 
   zigBuildFlags = [
-    "-Dversion_data_path=${zig_0_12.src}/doc/langref.html.in"
+    "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in"
   ];
 
   nativeBuildInputs = [
-    zig_0_12.hook
+    zig_0_13.hook
   ];
 
   postPatch = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}";
     homepage = "https://github.com/zigtools/zls";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda moni ];
+    maintainers = with lib.maintainers; [ figsoda moni _0x5a4 ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/development/tools/language-servers/zls/deps.nix
index 4de50620ef9c7..1c6b2cd25f8c7 100644
--- a/pkgs/development/tools/language-servers/zls/deps.nix
+++ b/pkgs/development/tools/language-servers/zls/deps.nix
@@ -4,17 +4,17 @@
 
 linkFarm "zig-packages" [
   {
-    name = "12201314cffeb40c5e4e3da166217d2c74628c74486414aaf97422bcd2279915b9fd";
+    name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147";
     path = fetchzip {
-      url = "https://github.com/ziglibs/known-folders/archive/bf79988adcfce166f848e4b11e718c1966365329.tar.gz";
-      hash = "sha256-Q7eMdyScqj8qEiAHg1BnGRTsWSQOKWWTc6hUYHNlgGg=";
+      url = "https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz";
+      hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g=";
     };
   }
   {
-    name = "12200d71e4b7029ea56a429e24260c6c0e85a3069b0d4ba85eace21a0fd75910aa64";
+    name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d";
     path = fetchzip {
-      url = "https://github.com/ziglibs/diffz/archive/e10bf15962e45affb3fcd7d9a950977a69c901b3.tar.gz";
-      hash = "sha256-yVFPVn4jGfcoE2V4xdTqdThYPutshL6U4feDzetWgFw=";
+      url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz";
+      hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo=";
     };
   }
 ]
diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix
index 393f2512e875d..3434e4771b3a3 100644
--- a/pkgs/development/tools/mbed-cli/default.nix
+++ b/pkgs/development/tools/mbed-cli/default.nix
@@ -28,7 +28,7 @@ buildPythonApplication rec {
     homepage = "https://github.com/ARMmbed/mbed-cli";
     description = "Arm Mbed Command Line Interface";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix
index 56dbcb06a12ce..d83381080a5fe 100644
--- a/pkgs/development/tools/misc/c2ffi/default.nix
+++ b/pkgs/development/tools/misc/c2ffi/default.nix
@@ -55,6 +55,6 @@ llvmPackages.stdenv.mkDerivation {
     description = "LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces";
     mainProgram = "c2ffi";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
  };
 }
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index 1c3c1ba622327..bb5a792fa4dc3 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
 
     platforms = with platforms; linux ++ cygwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix
index 31e7134e7e87d..10d6d2e7d020c 100644
--- a/pkgs/development/tools/misc/chruby/default.nix
+++ b/pkgs/development/tools/misc/chruby/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     description = "Changes the current Ruby";
     homepage = "https://github.com/postmodern/chruby";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "chruby-exec";
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix
index d491b7199d389..fc07a523ff0b5 100644
--- a/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/pkgs/development/tools/misc/cwebbin/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     description = "Literate Programming in C/C++";
     platforms = with platforms; unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.abstyles;
   };
 }
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 57f8b2d84a7c3..015e7ff991d12 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 2af3f4cd39872..93636e1675d86 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     homepage = "https://elfinfo.roboticoverlords.org/";
     changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix
index 81f35d7ec481b..a59b55be975d8 100644
--- a/pkgs/development/tools/misc/go-license-detector/default.nix
+++ b/pkgs/development/tools/misc/go-license-detector/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     description = "Reliable project licenses detector";
     homepage = "https://github.com/go-enry/go-license-detector";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "license-detector";
   };
 }
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
index bee2b85c78da5..0d3da390847a7 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     mainProgram = "gtkperf";
     homepage = "https://gtkperf.sourceforge.net/";
     license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix
index 34177e142d1cd..ed07a8d3c3447 100644
--- a/pkgs/development/tools/misc/jiq/default.nix
+++ b/pkgs/development/tools/misc/jiq/default.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
     license = licenses.mit;
     description = "jid on jq - interactive JSON query tool using jq expressions";
     mainProgram = "jiq";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix
index c6d89a4c6bdb2..e8d919cfabe02 100644
--- a/pkgs/development/tools/misc/libwhich/default.nix
+++ b/pkgs/development/tools/misc/libwhich/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     mainProgram = "libwhich";
     homepage = "https://github.com/vtjnash/libwhich";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index 189f389587842..594828e259542 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.ltrace.org/";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix
index f3361628288f6..35a503d8b0aad 100644
--- a/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/pkgs/development/tools/misc/terraform-lsp/default.nix
@@ -23,6 +23,6 @@ buildGoModule rec {
     mainProgram = "terraform-lsp";
     homepage = "https://github.com/juliosueiras/terraform-lsp";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix
index eeaeca1f9c8a3..5a50600d47c89 100644
--- a/pkgs/development/tools/misc/tie/default.nix
+++ b/pkgs/development/tools/misc/tie/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Allow multiple web change files";
     mainProgram = "tie";
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.abstyles;
   };
 }
diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix
index d81760daa5fcc..90cf25e54772a 100644
--- a/pkgs/development/tools/misc/tockloader/default.nix
+++ b/pkgs/development/tools/misc/tockloader/default.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/tock/tockloader";
     changelog = "https://github.com/tock/tockloader/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/development/tools/misc/travis/shell.nix
index ddcf493bb4682..0820e89b4ba3e 100644
--- a/pkgs/development/tools/misc/travis/shell.nix
+++ b/pkgs/development/tools/misc/travis/shell.nix
@@ -1,9 +1,10 @@
 # Env to update Gemfile.lock / gemset.nix
-
-with import <nixpkgs> {};
-stdenv.mkDerivation {
+{
+  pkgs ? import ../../../../.. { },
+}:
+pkgs.stdenv.mkDerivation {
   name = "env";
-  buildInputs = [
+  buildInputs = with pkgs; [
     ruby.devEnv
     gnumake
     bundix
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index acfaa7873655d..030dcf400f738 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "whatstyle";
     homepage = "https://github.com/mikr/whatstyle";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index 6c71e374ffc7b..6f4e5505299ee 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -13,7 +13,7 @@ let
     license = lib.licenses.asl20;
     homepage = "https://www.martiansoftware.com/nailgun/";
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
   server = stdenvNoCC.mkDerivation {
diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix
index e57dcffac2c0b..0b6aaea05f70b 100644
--- a/pkgs/development/tools/nasmfmt/default.nix
+++ b/pkgs/development/tools/nasmfmt/default.nix
@@ -24,6 +24,6 @@ buildGoModule rec {
     mainProgram = "nasmfmt";
     homepage = "https://github.com/yamnikov-oleg/nasmfmt";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index d0308f31f7eef..9f6055677e84c 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -10,13 +10,13 @@ else
 let params =
   if lib.versionAtLeast ocaml.version "4.12" && !legacy
   then rec {
-    version = "8.02.01";
+    version = "8.03.00";
 
     src = fetchFromGitHub {
       owner = "camlp5";
       repo = "camlp5";
       rev = version;
-      hash = "sha256-qSA2559vqWLU+0ns7LPUGI2K5f8sfu+QQ0sCH8sR6To=";
+      hash = "sha256-hu/279gBvUc7Z4jM6EHiar6Wm4vjkGXl+7bxowj+vlM=";
     };
 
     nativeBuildInputs = [ makeWrapper ocaml findlib perl ];
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 94848a79360c7..4575226afdec7 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     inherit (ocamlPackages.ocaml.meta) platforms;
     description = "Simple package build system for OCaml";
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/development/tools/ocaml/opam-publish/default.nix
index ce0a807cc56ea..9204ecdd12f19 100644
--- a/pkgs/development/tools/ocaml/opam-publish/default.nix
+++ b/pkgs/development/tools/ocaml/opam-publish/default.nix
@@ -15,17 +15,15 @@ in
 
 buildDunePackage rec {
   pname = "opam-publish";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = pname;
     rev = version;
-    sha256 = "sha256-CiZOljFBUUC3ExGSzzTATGqmxKjbzjRlL4aaL/fx9zI=";
+    hash = "sha256-ll6G9L7zAw53R7FxvZDBL300b+YElzpBygbiIWB3FUU=";
   };
 
-  duneVersion = "3";
-
   buildInputs = [
     cmdliner
     lwt_ssl
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix
index 81a513edd687c..b37043ca41cc4 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/development/tools/ofono-phonesim/default.nix
@@ -34,7 +34,7 @@ mkDerivation {
     mainProgram = "phonesim";
     homepage = "https://01.org/ofono";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 2441df861d591..bd5102e038a23 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -11,13 +11,13 @@ let
 in
 let finalPackage = buildDotnetModule rec {
   pname = "omnisharp-roslyn";
-  version = "1.39.11";
+  version = "1.39.12";
 
   src = fetchFromGitHub {
     owner = "OmniSharp";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-b7LC3NJyw0ek3y6D3p4bKVH4Od2gXmW5/8fCCY9n3iE=";
+    repo = "omnisharp-roslyn";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
   };
 
   projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
@@ -79,15 +79,15 @@ let finalPackage = buildDotnetModule rec {
     no-sdk = with-sdk null;
   };
 
-  meta = with lib; {
+  meta = {
     description = "OmniSharp based on roslyn workspaces";
     homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
-    sourceProvenance = with sourceTypes; [
+    sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryNativeCode # dependencies
     ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tesq0 ericdallo corngood mdarocha ];
     mainProgram = "OmniSharp";
   };
 }; in finalPackage
diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix
index 6379a4a293414..65912a50593b8 100644
--- a/pkgs/development/tools/omnisharp-roslyn/deps.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix
@@ -2,145 +2,144 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
-  (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.15.0"; sha256 = "0nh1954zs6crl3nrgf41b2mvipf3pxda8dxg21bbdf7yysq7izw3"; })
-  (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.15.0"; sha256 = "0xzlnadascsiibdhmpbqaawqlpyrwridih7y7054zsijlz1lp3am"; })
-  (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; })
-  (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.5.0"; sha256 = "00w9r2lv0yy30dafn6gs2qf4f6hhsg48923d2sdkyjdc94bx4kp4"; })
-  (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.5.0"; sha256 = "0fy3cww1yclyvlhzla4klamcw7sjy2fg3sr2ihpd4jxlyd8qy60l"; })
-  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
-  (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; sha256 = "1pvy3kss6s1v60yspfw11y3rs750rbxh735p90zrgxjshp9sq5g0"; })
-  (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; sha256 = "1ppw9nx9s5yyp6j8ljky7l9y5b91yf0sj2lqbakabjvzppr0pw4l"; })
-  (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; })
-  (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; sha256 = "17g4ka0c28l9v3pmf3i7cvic137h7zg6xqc78qf5j5hj7qbcps5g"; })
-  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; sha256 = "1p8ikc91qc2b1h68w44brb64dy5kmkb089hdliwp02gba3dszw67"; })
-  (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; sha256 = "18xavj7zii38gkk6bkblif7j1j7y33z7f06xm81ljdl2124lbqc4"; })
-  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; sha256 = "1mxm6xrq4illg502kjz4l7j0vjcpfv2li9wrvf4ix9m09vdwk2jl"; })
-  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; sha256 = "0r82hrjjqpxjp3l7ncy8jdj30p7y0p1hhr1dbfrj5l3i0zxrrcj4"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.9.0-3.23611.3"; sha256 = "0b3lwd4m3jw7mf56xhzx4d3ziykv8g39a2s1x782c9bagh8i1b1f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.9.0-3.23611.3/microsoft.codeanalysis.common.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.9.0-3.23611.3"; sha256 = "0cja5pjhhh33lmc1kfqw9l3x1pb9g2dda6wgn9i92ay51j52l43n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.9.0-3.23611.3"; sha256 = "0alnvk5f68glimkqsz590pryg7pa5p0wp6i4aif1k5j1jz0b03v6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.features.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.9.0-3.23611.3"; sha256 = "1ai22hjqyc5xx1dpwl3nm4yjqjs9n6iw5whprpvb7vi8kv9zz16q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.scripting.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.9.0-3.23611.3"; sha256 = "0x8xr193zqddmns0xx20hsf08qrb6fjjczgdm9yjr72p2djp14br"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.workspaces.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore"; version = "4.9.0-3.23611.3"; sha256 = "13gx7v30jqikms0dh6in8kslgasdpj3j0jk1x3f9x0sgq8864ad9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.9.0-3.23611.3"; sha256 = "12v6vcwnkdf84hs79ma4dkys7z07cf05k2ca1fnkz55zwaib4n59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.omnisharp.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.9.0-3.23611.3"; sha256 = "08c2b63vqwwda34kyrjglj2xgjjhqzgmdcnby8nm09j7jpz4z31y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler"; version = "4.9.0-3.23611.3"; sha256 = "06svd5nhvyrww5prnx0055g0flfdi1x5n89in74i71mqvskqkh38"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razorcompiler/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.razorcompiler.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.9.0-3.23611.3"; sha256 = "0nz2124hgxrh9k9c5p6xavkw8glmpwiq3qclvbggx9v8bnfl4p9k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.9.0-3.23611.3/microsoft.codeanalysis.features.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.9.0-3.23611.3"; sha256 = "0k37wrw5jy57grbi9i0rx76ig2jplikkmiyzvzrydl0mmrb5ks1k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.9.0-3.23611.3/microsoft.codeanalysis.scripting.common.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.9.0-3.23611.3"; sha256 = "12scgd8bvh1p5hvkfcbm58j77ancn6wy23wdmwy0kqj0wm10n1wy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.9.0-3.23611.3/microsoft.codeanalysis.workspaces.common.4.9.0-3.23611.3.nupkg"; })
-  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
-  (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; sha256 = "0g4fqxqy68bgsqzxdpz8n1sw0az1zgk33zc0xa8bwibwd1k2s6pj"; })
-  (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; })
-  (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; })
-  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
-  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; })
-  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; sha256 = "0z7mpiljkqjw1qi5zapv7mg9pyfyzlgmil34j4wi3y9r19bsb87z"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.8.0"; sha256 = "0395fkyhibrlz672v23rgalbzw3y878aclk6shqvdk9xca6bg4b1"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; })
-  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
-  (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
-  (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-rc.122"; sha256 = "0sszc6426749r7dqq1i46pwl92n1dklqd723px57pjs0b1a7ddwc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-rc.122/nuget.common.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-rc.122"; sha256 = "06d7r5yxf69d2wagpzkd77cnrbm5cv3z3dfsgj1zy7c2pb9a2rmk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-rc.122/nuget.configuration.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-rc.122"; sha256 = "1sarid71h7cs7d2h7zv313rxx1icpwli2lcfpasascsf0ahbf0pv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.122/nuget.dependencyresolver.core.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-rc.122"; sha256 = "07pfykvbm070dyiraillk5h4rzmfm89dr0km7bnflf1hq9l6z5xi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-rc.122/nuget.frameworks.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-rc.122"; sha256 = "1kflrd8kmd80190zjll4rzmfvz36ffnnb4w0psm977qpj90vpcgl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-rc.122/nuget.librarymodel.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-rc.122"; sha256 = "1bhaclf8x3vgwd1hb05knb1hyq7kdg64l959mgsd9cwqgjy5rksy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-rc.122/nuget.packaging.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.8.0-rc.122"; sha256 = "10c2mfim8hk3jjbclaibh3j4cr9ii9mhg2f9f4pvcwwdd2xwcv0d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.8.0-rc.122/nuget.packaging.core.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.122"; sha256 = "07ddcwbpqj9ki56k26fqr2ya6lh81fx9iacq40gz2jnlfkx5ipa1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.122/nuget.projectmodel.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.122"; sha256 = "012zjl6lqv7smgksjiglabnhx5ywqf0pl357kppmhbsifhrk7j6w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.122/nuget.protocol.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.122"; sha256 = "1y1f0kzwzm5nx7bhmqdxfvl367mm0xj9ddiv5bwg7iwjxfz0ga29"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.122/nuget.versioning.6.8.0-rc.122.nupkg"; })
-  (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.9"; sha256 = "0r8m36qqddzmnv4wdpxs7qa17f4kbb9r2zwn7n41amy3lp5f7w4z"; })
-  (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.9"; sha256 = "0g7v185mraq7bvihavagdl46rmfrkv1vr6cyb9jf1agi5i7abkyz"; })
-  (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.9"; sha256 = "0352bg0g4818y3nbxq8jmmdw60dgyxw4pjpr181sdyi73vmbnlrg"; })
-  (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.9"; sha256 = "0vb5kmf4hnrbssgj3nwsjdns0671k1llyplagm57m5wliaw12qkh"; })
-  (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.9"; sha256 = "124af8b6ixra1xm168nz5wfn674xfk0zhpj9dmfaasfi33sdwvjb"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
-  (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; })
-  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; })
-  (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; sha256 = "02hmqwrdvqzq4ka4kpf88i7n3qp6lw1xwp7424kg08pa9y69swij"; })
-  (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; })
-  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; })
-  (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; })
-  (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; })
-  (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; })
-  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; })
-  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; sha256 = "08dadpd8lx6x7craw3h3444p7ncz4wk0a3j1681lyhhd56ln66f6"; })
-  (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; })
-  (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; })
-  (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; })
-  (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; })
-  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
-  (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; })
-  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; })
-  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; })
-  (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; })
-  (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; })
-  (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
-  (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; sha256 = "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
-  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
-  (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; })
+  (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.15.0"; hash = "sha256-g/94sPb+uLZWEK83pFq/w924q1iBuJftoJkZ/UlJAVo="; })
+  (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.15.0"; hash = "sha256-VY1Lw6cy6k8KOP7A2GLm2V+KuVJ43QrbilEzrZqy9Hc="; })
+  (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; hash = "sha256-Z5hkinAqOaWCfMUIaaDfY0uTN1ot71Q1IC1A+xpmSj4="; })
+  (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.5.0"; hash = "sha256-5E7SF0msST+bFm2IhMjTEBpHHBb6GetUA8N7sKnIiQM="; })
+  (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.5.0"; hash = "sha256-FBiPUfO0S9IujCLr8ZzwUh/OqqKTKPoh3Z4yHzhnwzs="; })
+  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; })
+  (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; hash = "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8="; })
+  (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; hash = "sha256-lPAL8r1/y6WmWpgKqYHzIa3iEz1+Soqkud4XnbpN/N4="; })
+  (fetchNuGet { pname = "MediatR"; version = "8.1.0"; hash = "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM="; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; })
+  (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; hash = "sha256-r+jLFj4SFlkcRofhbt4/8IzA4mYnDlfv2IkiwYCa5J0="; })
+  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; hash = "sha256-x/Cv21DrCXB5pA0mBNass/hGzMqLEI4MDEswHBKbEd0="; })
+  (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; hash = "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM="; })
+  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; hash = "sha256-VIrJ206gph6J25mnSMV2l8kN5KHkyylAeZRGgnM3tdc="; })
+  (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; hash = "sha256-RLKc+wdx0CKzWy1kCMMF/lwwZJPIM3vouLJfLGWGAmU="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; hash = "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.12.0-1.24358.3"; hash = "sha256-UQ0tDpF+OxAgRXIPiJuT7z01Weqn2bLo+kIwkdcMaXs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.12.0-1.24358.3/microsoft.codeanalysis.common.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.12.0-1.24358.3"; hash = "sha256-OuB9qEQLc64Ido++o3mAZUZ6IvuB8rTzOf663k/0Kcc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.12.0-1.24358.3"; hash = "sha256-PNPdyFwwsReDd1QC1KmnGrXVMYNPghIShI7il3UEcrA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.features.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.12.0-1.24358.3"; hash = "sha256-titifcvaYU0rc9ZoEoitT2Wbw/CDRYr7bRm1ecSLDU0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.scripting.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.12.0-1.24358.3"; hash = "sha256-9CROWJt789h964idgJ/qqu+rAQkygcwtE2ngyeL/bhE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.workspaces.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; hash = "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore"; version = "4.12.0-1.24358.3"; hash = "sha256-0kv2XunbYQsbusmRl2WchiskolxwZWThx80ZUzcw3c8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.12.0-1.24358.3"; hash = "sha256-gLIJA1zaq4RbRCDhALlIwUBasRbekjFiuLCNyQckegA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.12.0-1.24358.3"; hash = "sha256-aXwLNsh6Gmd98rLZ1fWjpNaCCg7TYv70Qc7dRccNk/U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.12.0-1.24358.3"; hash = "sha256-TCl/MzgHNUBUU56MVSGeOlCUMSTeS8cG5iZkZ/E9ElY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.12.0-1.24358.3/microsoft.codeanalysis.features.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.12.0-1.24358.3"; hash = "sha256-qvmZdcshzsXJLdWev3QyQscNeliEqzOGE3q7L/hR67w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.12.0-1.24358.3/microsoft.codeanalysis.scripting.common.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.12.0-1.24358.3"; hash = "sha256-9SQ1nAfJsDswOfASVSZ2iV7GoXcsRmNhVcr+Dv266zk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.12.0-1.24358.3/microsoft.codeanalysis.workspaces.common.4.12.0-1.24358.3.nupkg"; })
+  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; })
+  (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; })
+  (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; hash = "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
+  (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; hash = "sha256-pa3MT+QWrWeehQwUWtTS/Rwto8IIDgAt+zLqaUAQoJ0="; })
+  (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; hash = "sha256-Q8owHXaXkJPy13yGlj+VYGS9XMqYWUZYB6yoT0/m4ek="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
+  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; hash = "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="; })
+  (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; hash = "sha256-/6ClVwo5+RE5kWTQWB/93vmbXj37ql8iDlziKWm89Xw="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; hash = "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.8.0"; hash = "sha256-YZG3jGI9zbYx1GZSptBBfvC/qHp5iC2O+TSvCP10JQ0="; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; hash = "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc="; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; hash = "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0="; })
+  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; })
+  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
+  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; })
+  (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; hash = "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4="; })
+  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; })
+  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
+  (fetchNuGet { pname = "NuGet.Common"; version = "6.11.0-rc.110"; hash = "sha256-S0K+RiSHJFzx+qbTJ7KY1Mh/L9hDJfL/F1YjzlhP3ao="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.11.0-rc.110/nuget.common.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Configuration"; version = "6.11.0-rc.110"; hash = "sha256-NJzuKWDMUAn8aLt/aB4xht65a9CCnwY0IfnHfFHd/p4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.11.0-rc.110/nuget.configuration.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.11.0-rc.110"; hash = "sha256-12oRGUo4L7TslA6iV3OoMayG/t3ToOJ4fdGFh2U8Rxo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.11.0-rc.110/nuget.dependencyresolver.core.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.11.0-rc.110"; hash = "sha256-FmvFhdCJ/xH92tr+7uMNdimcpFxyW7Y/roPcS0TJX3g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.11.0-rc.110/nuget.frameworks.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.11.0-rc.110"; hash = "sha256-PYiEmV44XWUCK7Wahs8ZQ8GHcL4yO+fT+Y1OQHna68E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.11.0-rc.110/nuget.librarymodel.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Packaging"; version = "6.11.0-rc.110"; hash = "sha256-pnGx4JWJ02X18Qko5TX1DTbbbQj1msdKb0Lrphzyjps="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.11.0-rc.110/nuget.packaging.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.11.0-rc.110"; hash = "sha256-xE1Us1qn3qAbLS/1rdZMWfl5tEO5pCQGp+P+VUrLBOQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.11.0-rc.110/nuget.projectmodel.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Protocol"; version = "6.11.0-rc.110"; hash = "sha256-XS8HsEDPoEjBNbfdo1c+PHB6BUOs8IpdfXvkmDsSZD4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.11.0-rc.110/nuget.protocol.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "NuGet.Versioning"; version = "6.11.0-rc.110"; hash = "sha256-eyhOSwBFquzExUis+zGgP5gCO/nVSY5IzXcWeeVz/Ww="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.11.0-rc.110/nuget.versioning.6.11.0-rc.110.nupkg"; })
+  (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.9"; hash = "sha256-n/DjyqXDVxWIPZZ/kdNak7gTFD6638bJtvW3hrEZFWU="; })
+  (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.9"; hash = "sha256-38+lTizxqeBkWp6ZvMOe2dVsCG1PbQXjXgerXAsK+zw="; })
+  (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.9"; hash = "sha256-L1O76h4n+qYDCvnKS3j3rwHDW60S4b7s8Cgg8sBbogw="; })
+  (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.9"; hash = "sha256-cGIRuIqUl3pKfYpeT2mY4RigbZOa2yGf1itbSFydZW0="; })
+  (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.9"; hash = "sha256-S27e9BjRaaVcbUle+MF0nRxjHS/fIhNqDyr3aBZyiog="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.8"; hash = "sha256-2heeK2naqrjk/ggcEPO1GhcumiXU8sC4VNFh/Xr+wd4="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.8"; hash = "sha256-j7004Tk/GyQigot9Sx5cgAU9dzhFfOGs02zaj412x8g="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.8"; hash = "sha256-Omio9F3a0w52x3CLpk/MOCmB5yeaFxVV9ZOMU18eKew="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.8"; hash = "sha256-eo+peRW0MEkrczXtlMPNPOKew9k/jH0e4jUzOXI8Y44="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.8"; hash = "sha256-eE2gvpsXhtAmYqdxLhrne+/u4V/o7tbicuGUEWL4p4s="; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
+  (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; })
+  (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; })
+  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; })
+  (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; hash = "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo="; })
+  (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; })
+  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; hash = "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="; })
+  (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; hash = "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="; })
+  (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; hash = "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="; })
+  (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; hash = "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="; })
+  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; hash = "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="; })
+  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; })
+  (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; hash = "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; })
+  (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; })
+  (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="; })
+  (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; })
+  (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; })
+  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; })
+  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
+  (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; })
+  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; })
+  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; hash = "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="; })
+  (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; hash = "sha256-/EEdeNvp9FrLeVnmowzHk6nn0KmPf6L9Poc7l/R948A="; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; hash = "sha256-OJ4NJ8E/8l86aR+Hsw+k/7II63Y/zPS+MgC+UfeCXHM="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; hash = "sha256-jXst4NyUKOTOmLacSwgQB71W12nKZtveJA25dCtpyys="; })
+  (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; })
+  (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; })
+  (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; hash = "sha256-Q6fPtMPNW4+SDKCabJzNS+dw4B04Oxd9sHH505bFtQo="; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
+  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; })
+  (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; })
 ]
diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix
index 48ddac5088429..41cbef2a720b5 100644
--- a/pkgs/development/tools/package-project-cmake/default.nix
+++ b/pkgs/development/tools/package-project-cmake/default.nix
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       packaging process into a single, easy-to-use command.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 97e825bfe390c..c9faf8a788f89 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -4,6 +4,7 @@
   tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json;
   tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json;
   tree-sitter-bitbake = lib.importJSON ./tree-sitter-bitbake.json;
+  tree-sitter-bqn = lib.importJSON ./tree-sitter-bqn.json;
   tree-sitter-c = lib.importJSON ./tree-sitter-c.json;
   tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json;
   tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
new file mode 100644
index 0000000000000..c909530a21a68
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/shnarazk/tree-sitter-bqn",
+  "rev": "a90b371503f158699042423918e4c5e9285f5519",
+  "date": "2023-10-12T14:03:08+09:00",
+  "path": "/nix/store/l8jagwjzgm9kwgda2rqgkzxpszlmf6br-tree-sitter-bqn",
+  "sha256": "0xma9dmz591xfy20g7sk535d5w21migs9zajjw2nd1c5czj00nzw",
+  "hash": "sha256-/FsA5GeFhWYFl1L9pF+sQfDSyihTnweEdz2k8mtLqnY=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 9b7558b53c7b4..4c2f2c10aee58 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -102,6 +102,10 @@ let
       orga = "polarmutex";
       repo = "tree-sitter-beancount";
     };
+    "tree-sitter-bqn" = {
+      orga = "shnarazk";
+      repo = "tree-sitter-bqn";
+    };
     "tree-sitter-clojure" = {
       orga = "sogaiu";
       repo = "tree-sitter-clojure";
diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix
index 6ae32206c6d0e..bc4d0c9ca6114 100644
--- a/pkgs/development/tools/pifpaf/default.nix
+++ b/pkgs/development/tools/pifpaf/default.nix
@@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "pifpaf";
     homepage = "https://github.com/jd/pifpaf";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix
index 13562e26727f6..95a028c6f8095 100644
--- a/pkgs/development/tools/poac/default.nix
+++ b/pkgs/development/tools/poac/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     homepage = "https://poac.pm";
     description = "Package Manager for C++";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     # error: call to 'format' is ambiguous
     broken = true; # last successful build 2023-12-31
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index e4dbbd76e76ec..2e2cecf774396 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Tool that aims at generating automatically execution trace from HPC programs";
     license = licenses.cecill-b;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix
index 2dec619fdc989..b4751caa883a2 100644
--- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix
+++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
     downloadPage = "https://github.com/ent/contrib/";
     license = licenses.asl20;
     homepage = "https://entgo.io/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix
index 1d47e79e8ad14..3df3ef3bc42b8 100644
--- a/pkgs/development/tools/pup/default.nix
+++ b/pkgs/development/tools/pup/default.nix
@@ -18,6 +18,6 @@ buildGoModule rec {
     mainProgram = "pup";
     homepage = "https://github.com/ericchiang/pup";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index f0383d5c9abdc..9479a949ff3c4 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -112,6 +112,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     description = "Standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools";
     mainProgram = "react-native-debugger";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/react-static/default.nix b/pkgs/development/tools/react-static/default.nix
index ea21f3ca3e4cf..5307f93a4b4c8 100644
--- a/pkgs/development/tools/react-static/default.nix
+++ b/pkgs/development/tools/react-static/default.nix
@@ -50,6 +50,6 @@ mkYarnPackage rec {
     homepage = "https://github.com/react-static/react-static";
     license = lib.licenses.mit;
     mainProgram = "react-static";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 7f5f73fea8fa4..5787b3dd1c88d 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2024-07-15";
-  cargoHash = "sha256-O6YzvkiqNCk/lH129kOkH9owiI4PBE990AS8HFtX77k=";
+  version = "2024-07-22";
+  cargoHash = "sha256-cimGPLp7TuAFvrr2i5zY5Q4GRxOfC1Vpe0qGHepBf5E=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    sha256 = "sha256-zNaYyxBHmrfk4EfqvxUU97iOw1uchnBuytqgt/Zm8LA=";
+    sha256 = "sha256-LH3YPNUpJeCjiyf0yaYKxgCjUFtlB41Tr2tBTMGH//s=";
   };
 
   cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix
index 230bc558f0c97..ace1f1e8f2700 100644
--- a/pkgs/development/tools/selenium/chromedriver/binary.nix
+++ b/pkgs/development/tools/selenium/chromedriver/binary.nix
@@ -1,16 +1,19 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook
-, glib, nspr, nss, libxcb
-, testers, chromedriver
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+  testers,
+  chromedriver,
 }:
 
 let
-  upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver;
-  allSpecs = {
-    x86_64-linux = {
-      system = "linux64";
-      hash = upstream-info.hash_linux;
-    };
+  upstream-info =
+    (import ../../../../applications/networking/browsers/chromium/upstream-info.nix)
+    .stable.chromedriver;
 
+  # See ./source.nix for Linux
+  allSpecs = {
     x86_64-darwin = {
       system = "mac-x64";
       hash = upstream-info.hash_darwin;
@@ -22,21 +25,22 @@ let
     };
   };
 
-  spec = allSpecs.${stdenv.hostPlatform.system}
-    or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
-in stdenv.mkDerivation rec {
+  spec =
+    allSpecs.${stdenv.hostPlatform.system}
+      or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
+
+  inherit (upstream-info) version;
+in
+stdenv.mkDerivation {
   pname = "chromedriver";
-  version = upstream-info.version;
+  inherit version;
 
   src = fetchurl {
     url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
-    hash = spec.hash;
+    inherit (spec) hash;
   };
 
-  nativeBuildInputs = [ autoPatchelfHook ];
-  buildInputs = lib.optionals (!stdenv.isDarwin) [
-    glib nspr nss libxcb
-  ];
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     install -m555 -D "chromedriver" $out/bin/chromedriver
@@ -58,7 +62,7 @@ in stdenv.mkDerivation rec {
     maintainers = with maintainers; [ primeos ];
     # Note from primeos: By updating Chromium I also update Google Chrome and
     # ChromeDriver.
-    platforms = attrNames allSpecs;
+    platforms = platforms.darwin;
     mainProgram = "chromedriver";
   };
 }
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index da1a2db8c86c7..4bf5f21ce1048 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "skaffold";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    hash = "sha256-q57n5Jo682u/YK+5bgYqMufjPuPOPsBgJzxSl1fdqxA=";
+    hash = "sha256-zcGMKxC2BIg2KPxmGG9UUJzpMdAQbZ8zDGtYyF1T7ZQ=";
   };
 
   vendorHash = null;
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index fa9dbcb7666f6..6e78caf84ff0d 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -18,13 +18,13 @@
 
 buildGoModule rec {
   pname = "skopeo";
-  version = "1.15.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    hash = "sha256-qE6c7+NMGmz1zDqtEfAQQp/gQ0FP034q8wVCdHZ1wY8=";
+    hash = "sha256-M9BRsW3mNIRAr+yXSmoPNNoEY/XrCFNt+m2PtTuJUO4=";
   };
 
   outputs = [ "out" "man" ];
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index 8202065031942..182427c4b3176 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -35,6 +35,6 @@ buildGoModule rec {
     mainProgram = "textql";
     homepage = "https://github.com/dinedal/textql";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix
index ded720948ff04..5d3d9a5385402 100644
--- a/pkgs/development/tools/toluapp/default.nix
+++ b/pkgs/development/tools/toluapp/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Tool to integrate C/Cpp code with Lua";
     homepage = "http://www.codenix.com/~tolua/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tolua++";
     platforms = with platforms; unix;
   };
diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix
index a37c79b34f248..5b386b9822634 100644
--- a/pkgs/development/tools/twilio-cli/default.nix
+++ b/pkgs/development/tools/twilio-cli/default.nix
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/twilio/twilio-cli";
     changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = nodejs-slim.meta.platforms;
     mainProgram = "twilio";
   };
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 6d377b00db390..9ff37be205122 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -28,7 +28,7 @@ buildPythonApplication rec {
     homepage = "https://github.com/Kuniwak/vint";
     license = licenses.mit;
     mainProgram = "vint";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix
index a5002fdabc372..3ad734efdce9c 100644
--- a/pkgs/development/tools/vsce/default.nix
+++ b/pkgs/development/tools/vsce/default.nix
@@ -12,16 +12,16 @@
 
 buildNpmPackage rec {
   pname = "vsce";
-  version = "2.28.0";
+  version = "2.31.1";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-vsce";
     rev = "v${version}";
-    hash = "sha256-LMePEsNU62oSp/aaeUZY7A+0rTHiYOBqWBiqSpXUJOY=";
+    hash = "sha256-VXZBuaJn0VGpq1sIwsp+OcYErYShTCcU/FnTgDHmf7g=";
   };
 
-  npmDepsHash = "sha256-Ml65YY4vqzntgCP9FoEGpR5rMkYL+alN9pSpbvR28E0=";
+  npmDepsHash = "sha256-Ftf6m5gRcYnkYfRx9vUys9uax8pwyyjUbfw3am8WriA=";
 
   postPatch = ''
     substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"'
diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix
index bfbfbdf5c1c8d..89e3f2257ff81 100644
--- a/pkgs/development/tools/web-ext/default.nix
+++ b/pkgs/development/tools/web-ext/default.nix
@@ -30,6 +30,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/mozilla/web-ext";
     license = lib.licenses.mpl20;
     mainProgram = "web-ext";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix
index 863d53bb09716..e895ffa43ddb1 100644
--- a/pkgs/development/tools/wgo/default.nix
+++ b/pkgs/development/tools/wgo/default.nix
@@ -34,6 +34,6 @@ buildGoModule {
     mainProgram = "wgo";
     homepage = "https://github.com/bokwoon95/wgo";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/development/tools/yo/default.nix
index 325939a7609b0..ded4b5d0202a2 100644
--- a/pkgs/development/tools/yo/default.nix
+++ b/pkgs/development/tools/yo/default.nix
@@ -23,6 +23,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/yeoman/yo";
     license = lib.licenses.bsd2;
     mainProgram = "yo";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix
index 3d917e4348968..ee24281798d74 100644
--- a/pkgs/development/tools/zsv/default.nix
+++ b/pkgs/development/tools/zsv/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/liquidaty/zsv";
     changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/games/antsimulator/default.nix
index 637c53d1b3bfe..204b1c50f268b 100644
--- a/pkgs/games/antsimulator/default.nix
+++ b/pkgs/games/antsimulator/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Simple Ants simulator";
     mainProgram = "antsimulator";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/games/badlion-client/default.nix b/pkgs/games/badlion-client/default.nix
index 8102da7673432..78278be9fca3e 100644
--- a/pkgs/games/badlion-client/default.nix
+++ b/pkgs/games/badlion-client/default.nix
@@ -27,7 +27,7 @@ in
       description = "Most Complete All-In-One Mod Library for Minecraft with 100+ Mods, FPS Improvements, and more";
       homepage = "https://client.badlion.net";
       license = with licenses; [ unfree ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       mainProgram = "badlion-client";
       platforms = [ "x86_64-linux" ];
     };
diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index 0d74d8dbe55c4..14aa6d43a5870 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -25,6 +25,6 @@ buildGoModule rec {
     homepage = "https://download.tuxfamily.org/boohu/index.html";
     license = licenses.isc;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 7f43e8949b70d..400fa33e68625 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "https://bzflag.org/";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix
index 7482a1cd27f88..ed1867aeffc16 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/games/chiaki/default.nix
@@ -59,7 +59,7 @@ mkDerivation rec {
     homepage = "https://git.sr.ht/~thestr4ng3r/chiaki";
     description = "Free and Open Source PlayStation Remote Play Client";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "chiaki";
   };
diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix
index cd0a8f07d812f..509fa9eccb22d 100644
--- a/pkgs/games/chiaki4deck/default.nix
+++ b/pkgs/games/chiaki4deck/default.nix
@@ -85,11 +85,8 @@ stdenv.mkDerivation rec {
     xxHash
   ];
 
-  # handle cmake not being able to identify if curl is built with websocket support, and library name discrepancy when curl not built with cmake
+  # handle library name discrepancy when curl not built with cmake
   postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail ' WS WSS' ""
-
     substituteInPlace lib/CMakeLists.txt \
       --replace-fail 'libcurl_shared' 'libcurl'
   '';
diff --git a/pkgs/games/doom-ports/chocolate-doom/default.nix b/pkgs/games/doom-ports/chocolate-doom/default.nix
index 10b96eb905628..7eb2824020423 100644
--- a/pkgs/games/doom-ports/chocolate-doom/default.nix
+++ b/pkgs/games/doom-ports/chocolate-doom/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     hydraPlatforms = lib.platforms.linux; # darwin times out
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/doom-ports/dhewm3/default.nix b/pkgs/games/doom-ports/dhewm3/default.nix
index 19cf87110caa6..94e4e4dc3d241 100644
--- a/pkgs/games/doom-ports/dhewm3/default.nix
+++ b/pkgs/games/doom-ports/dhewm3/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "Doom 3 port to SDL";
     mainProgram = "dhewm3";
     license = lib.licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/games/doom-ports/eternity-engine/default.nix b/pkgs/games/doom-ports/eternity-engine/default.nix
index 5239cae4d8ccb..92ae7ea0c9e9f 100644
--- a/pkgs/games/doom-ports/eternity-engine/default.nix
+++ b/pkgs/games/doom-ports/eternity-engine/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     mainProgram = "eternity";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/doom-ports/odamex/default.nix b/pkgs/games/doom-ports/odamex/default.nix
index 095c92891502c..fb3b9a2fda4f0 100644
--- a/pkgs/games/doom-ports/odamex/default.nix
+++ b/pkgs/games/doom-ports/odamex/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "Client/server port for playing old-school Doom online";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index 48ad870bd4d2e..558f3755d1cfd 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
     description = "RPG Maker 2000/2003 and EasyRPG games interpreter";
     homepage = "https://easyrpg.org/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = lib.optionalString stdenv.hostPlatform.isDarwin "EasyRPG Player";
   };
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index 8e774a63ee547..b794543ff4ee9 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl2Plus;
     homepage = "https://sourceforge.net/projects/extremetuxracer/";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "etr";
     platforms = with lib.platforms; linux;
   };
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 1f31c20c7e489..702e259b97897 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation {
 
     license = licenses.gpl2Plus;
 
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     hydraPlatforms = platforms.linux; # sdl-config times out on darwin
   };
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
index 27b0255eba09f..00bf3a9d4278b 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Old-school vertical shoot-em-up / bullet hell";
     mainProgram = "garden";
     homepage = "https://garden.sourceforge.net/drupal/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3;
   };
 
diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix
index 1c7627582d61f..41cc79f26c2e3 100644
--- a/pkgs/games/gnome-hexgl/default.nix
+++ b/pkgs/games/gnome-hexgl/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     mainProgram = "gnome-hexgl";
     homepage = "https://github.com/alexlarsson/gnome-hexgl";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix
index 12715ff9247cf..34e996f499b97 100644
--- a/pkgs/games/harmonist/default.nix
+++ b/pkgs/games/harmonist/default.nix
@@ -26,6 +26,6 @@ buildGoModule rec {
     '';
     homepage = "https://harmonist.tuxfamily.org/";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 30620bea710b0..3d6eb81f3883a 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     homepage = "https://attnam.com/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     mainProgram = "ivan";
   };
 }
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index e03dda491c4c5..3f77d9bbe415f 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     mainProgram = "xlincity";
     license = licenses.gpl2Plus;
     homepage = "https://sourceforge.net/projects/lincity";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # ../lcintl.h:14:10: fatal error: 'libintl.h' file not found
     broken = stdenv.isDarwin;
   };
diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix
index 8bb0f795a823f..7bb3e30ef6af4 100644
--- a/pkgs/games/linthesia/default.nix
+++ b/pkgs/games/linthesia/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index 17e24d3af1a39..60650015a393e 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Arcade-style fire fighting game";
     mainProgram = "mrrescue";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     license = licenses.zlib;
     downloadPage = "http://tangramgames.dk/games/mrrescue";
diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix
index e9ebeadf45135..aa1100b3395c6 100644
--- a/pkgs/games/nudoku/default.nix
+++ b/pkgs/games/nudoku/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = "http://jubalh.github.io/nudoku/";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix
index 47c4cc6e4612a..bbc1c3be11c7f 100644
--- a/pkgs/games/openclonk/default.nix
+++ b/pkgs/games/openclonk/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
     homepage = "https://www.openclonk.org";
     license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc;
     mainProgram = "openclonk";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index a7c5fa3d02b1c..c50379d0c4221 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     mainProgram = "opendune";
     homepage = "https://github.com/OpenDUNE/OpenDUNE";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index bfd22c3825eb2..2af9368640afd 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     mainProgram = "openxcom";
     homepage = "https://openxcom.org";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix
index a9f95d9b85bb2..9fad36ed78261 100644
--- a/pkgs/games/path-of-building/default.nix
+++ b/pkgs/games/path-of-building/default.nix
@@ -17,13 +17,13 @@
 let
   data = stdenv.mkDerivation (finalAttrs: {
     pname = "path-of-building-data";
-    version = "2.46.0";
+    version = "2.47.3";
 
     src = fetchFromGitHub {
       owner = "PathOfBuildingCommunity";
       repo = "PathOfBuilding";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-L63pFaIjSDEzEud+v4IbNjFVdwTBU08/xICBIHzPutE=";
+      hash = "sha256-wxsU178BrjdeBTTPY2C3REWlyORWI+/fFijn5oa2Gms=";
     };
 
     nativeBuildInputs = [ unzip ];
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix
index 185b1c7a6886a..39f1d43fb46e3 100644
--- a/pkgs/games/qqwing/default.nix
+++ b/pkgs/games/qqwing/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     mainProgram = "qqwing";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 5c668557027e3..0a4ec4f326eb2 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -164,7 +164,7 @@ let
 
       homepage = "http://www.simutrans.com/";
       license = with licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       platforms = with platforms; linux; # TODO: ++ darwin;
     };
   };
diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix
index bf2175ed278b1..fcdd6616a506a 100644
--- a/pkgs/games/sm64ex/generic.nix
+++ b/pkgs/games/sm64ex/generic.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
       '';
     mainProgram = "sm64ex";
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   } // extraMeta;
 }
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 0fee9ce6c6cb5..5b932afbc49d0 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage = "http://tibia.com";
     license = lib.licenses.unfree;
     platforms = ["i686-linux"];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index 906c3b9bd36c0..bac78ab72f35b 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     description = "Infinite-world block sandbox game based on Minetest";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = stdenv.isAarch64;  # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'"
   };
 }
diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix
index a7f0e9f37bc81..2b23144c00b51 100644
--- a/pkgs/games/wireworld/default.nix
+++ b/pkgs/games/wireworld/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       cc-by-sa-40
     ];
     downloadPage = "https://ldjam.com/events/ludum-dare/53/wireworld";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 
 }
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index f5ec8e29b634b..5be4e17581b6e 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -145,6 +145,6 @@ stdenv.mkDerivation {
     homepage = "https://hk.canon/en/support/0101048401/1";
     license = licenses.unfree;
     platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
index 4bd6174b7ca52..4c64152e6c929 100644
--- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
+++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://onlinesupport.fujixerox.com";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index 47700265231f2..a76ecd6dcbf65 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
@@ -115,6 +115,6 @@ in stdenv.mkDerivation rec {
     # Tested on linux-x86_64. Might work on linux-i386.
     # Probably won't work on anything else.
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index fae7414d36188..142f32dd2593c 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -49,6 +49,6 @@ in stdenv.mkDerivation rec {
     homepage = "http://splix.ap2c.org";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix
index f299d3075c262..e0e51a0ba4d98 100644
--- a/pkgs/misc/jackaudio/tools.nix
+++ b/pkgs/misc/jackaudio/tools.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation (final: {
     homepage = "https://jackaudio.org";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix
index c53634a8b451f..c37568cfc9cbd 100644
--- a/pkgs/misc/opcua-client-gui/default.nix
+++ b/pkgs/misc/opcua-client-gui/default.nix
@@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/FreeOpcUa/opcua-client-gui";
     platforms = platforms.unix;
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "opcua-client";
   };
 }
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 6691feeec6bb0..7a6b47f8689f6 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Electric Sheep, a distributed screen saver for evolving artificial organisms";
     homepage = "https://electricsheep.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     license = licenses.gpl2Only;
   };
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
index b87374df14dfe..25ac901759140 100644
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/aanatoly/xtrlock-pam";
     description = "PAM based X11 screen locker";
     license = "unknown";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index d05d6831febd8..6343c5b1b9dd9 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -736,6 +736,26 @@ in rec {
     };
   };
 
+  tmux-floax = mkTmuxPlugin {
+    pluginName = "tmux-floax";
+    rtpFilePath = "floax.tmux";
+    version = "0-unstable-2024-07-24";
+    src = fetchFromGitHub {
+      owner = "omerxx";
+      repo = "tmux-floax";
+      rev = "46c0a6a8c3cf79b83d1b338f547acbbd1d306301";
+      hash = "sha256-bALZfVWcoAzcTeWwkBHhi7TzUQJicOBTNdeJh3O/Bj8=";
+    };
+    meta = {
+      description = "Floating pane for Tmux";
+      homepage = "https://github.com/omerxx/tmux-floax";
+      license = lib.licenses.gpl3Only;
+      maintainers = with lib.maintainers; [ redyf ];
+      mainProgram = "tmux-floax";
+      platforms = lib.platforms.all;
+    };
+  };
+
   tmux-fzf = mkTmuxPlugin {
     pluginName = "tmux-fzf";
     rtpFilePath = "main.tmux";
diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix
index 797f515c1a7c9..80d9a1c452001 100644
--- a/pkgs/misc/tpm2-pkcs11/default.nix
+++ b/pkgs/misc/tpm2-pkcs11/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tpm2_ptool";
   };
 }
diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix
index 2d599a7c56e75..ac4809d7a2fe9 100644
--- a/pkgs/os-specific/bsd/freebsd/default.nix
+++ b/pkgs/os-specific/bsd/freebsd/default.nix
@@ -3,7 +3,7 @@
   generateSplicesForMkScope,
   callPackage,
   attributePathToSplice ? [ "freebsd" ],
-  branch ? "release/14.0.0",
+  branch ? "release/14.1.0",
 }:
 
 let
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
new file mode 100644
index 0000000000000..d1e49d20103bb
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
@@ -0,0 +1,18 @@
+diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
+index 3757ed062ba5..584ada116386 100644
+--- a/sbin/fsck/fsck.c
++++ b/sbin/fsck/fsck.c
+@@ -375,11 +375,8 @@ checkfs(const char *pvfstype, const char *spec, const char *mntpt,
+ 			_exit(0);
+ 
+ 		/* Go find an executable. */
+-		execvP(execbase, _PATH_SYSPATH, __DECONST(char * const *, argv));
+-		if (spec)
+-			warn("exec %s for %s in %s", execbase, spec, _PATH_SYSPATH);
+-		else
+-			warn("exec %s in %s", execbase, _PATH_SYSPATH);
++		execvp(execbase, __DECONST(char * const *, argv));
++		warn("exec %s not found", execbase);
+ 		_exit(1);
+ 		/* NOTREACHED */
+ 
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
similarity index 98%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
index 73a0341bd3240..4800879ab0bdf 100644
--- a/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
+++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
@@ -17,12 +17,12 @@ index 2d3723b49f5b..6bbff732b9d7 100644
 +++ b/lib/libc/locale/collate.h
 @@ -36,6 +36,7 @@
  #ifndef _COLLATE_H_
- #define	_COLLATE_H_
+ #define        _COLLATE_H_
  
 +#include <stdint.h>
- #include <sys/cdefs.h>
  #include <sys/types.h>
  #include <limits.h>
+ #include "xlocale_private.h"
 diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c
 index 44b7e3292eae..79c30b7cf372 100644
 --- a/usr.bin/localedef/charmap.c
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch
rename to pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
index f597d6e3705b4..5865f93674e10 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
@@ -41,9 +41,12 @@ mkDerivation {
 
       "sys/rpc/types.h"
     ]
-    ++ lib.optionals (versionData.major == 14) [ "sys/sys/bitcount.h" ]
+    ++ lib.optionals (versionData.major == 14) [
+      "sys/sys/bitcount.h"
+      "sys/sys/linker_set.h"
+      "sys/sys/module.h"
+    ]
     ++ [
-
       # Listed in Makekfile as INC
       "include/mpool.h"
       "include/ndbm.h"
@@ -64,7 +67,7 @@ mkDerivation {
     ]
     ++ [
 
-      # Listed in Makekfile as SYSINC
+      # Listed in Makefile as SYSINCS
 
       "sys/sys/capsicum.h"
       "sys/sys/caprights.h"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
index 020a08c1d01ef..5d4bad19ad1d6 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
@@ -1,6 +1,7 @@
 {
   lib,
   mkDerivation,
+  versionData,
   bsdSetupHook,
   freebsdSetupHook,
   makeMinimal,
@@ -17,7 +18,7 @@ mkDerivation {
   extraPaths = [
     "lib/Makefile.inc"
     "lib/libc/include/libc_private.h"
-  ];
+  ] ++ lib.optionals (versionData.major == 14) [ "sys/sys/param.h" ];
   nativeBuildInputs = [
     bsdSetupHook
     freebsdSetupHook
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
index ba55a5f651ed4..e6febd1ee2251 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
@@ -1,5 +1,7 @@
-{ mkDerivation }:
+{ lib, mkDerivation }:
 mkDerivation {
   path = "sbin/fsck";
   extraPaths = [ "sbin/mount" ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix
new file mode 100644
index 0000000000000..a6082d569b5e5
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix
@@ -0,0 +1,13 @@
+{
+  lib,
+  mkDerivation,
+  libufs,
+}:
+mkDerivation {
+  path = "sbin/fsck_ffs";
+  extraPaths = [ "sbin/mount" ];
+
+  buildInputs = [ libufs ];
+
+  meta.platforms = lib.platforms.freebsd;
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix
new file mode 100644
index 0000000000000..99b8d74ec4ed9
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix
@@ -0,0 +1,10 @@
+{ lib, mkDerivation }:
+mkDerivation {
+  path = "sbin/fsck_msdosfs";
+  extraPaths = [
+    "sbin/mount"
+    "sbin/fsck"
+  ];
+
+  meta.platforms = lib.platforms.freebsd;
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix b/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix
new file mode 100644
index 0000000000000..6c930a51db889
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation,
+  libelf,
+  compatIfNeeded,
+}:
+mkDerivation {
+  path = "usr.sbin/kldxref";
+
+  buildInputs = [ libelf ] ++ compatIfNeeded;
+
+  # We symlink in our modules, make it follow symlinks
+  postPatch = ''
+    sed -i 's/FTS_PHYSICAL/FTS_LOGICAL/' $BSDSRCDIR/usr.sbin/kldxref/kldxref.c
+  '';
+}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
index a991e69265823..6d31b1fc49e33 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
@@ -187,7 +187,7 @@ mkDerivation {
       find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \;
       popd
 
-      mkdir $BSDSRCDIR/lib/libcompiler_rt/i386
+      mkdir $BSDSRCDIR/lib/libcompiler_rt/i386 $BSDSRCDIR/lib/libcompiler_rt/cpu_model
       make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags
       make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags install
 
@@ -195,7 +195,7 @@ mkDerivation {
       make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags install
 
       ln -s $BSDSRCDIR/lib/libc/libc.so.7 $BSDSRCDIR/lib/libc/libc.so  # not sure
-      mkdir $BSDSRCDIR/lib/libgcc_s/i386
+      mkdir $BSDSRCDIR/lib/libgcc_s/i386 $BSDSRCDIR/lib/libgcc_s/cpu_model
       make -C $BSDSRCDIR/lib/libgcc_s $makeFlags
       make -C $BSDSRCDIR/lib/libgcc_s $makeFlags install
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
index a116aff81f397..0a077e5aee1c3 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
@@ -1,6 +1,6 @@
 {
+  stdenv,
   mkDerivation,
-  lib,
   bsdSetupHook,
   freebsdSetupHook,
   makeMinimal,
@@ -16,7 +16,6 @@ mkDerivation {
     "sys/sys/elf64.h"
     "sys/sys/elf_common.h"
   ];
-  buildInputs = [ ];
   nativeBuildInputs = [
     bsdSetupHook
     freebsdSetupHook
@@ -25,5 +24,5 @@ mkDerivation {
     m4
   ];
 
-  meta.platforms = lib.platforms.freebsd;
+  BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
index a4885871ad1c5..69ce44762ee18 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
@@ -1,8 +1,8 @@
 {
+  lib,
   mkDerivation,
   libutil,
   libxo,
-  ...
 }:
 mkDerivation {
   path = "sbin/mount";
@@ -10,4 +10,6 @@ mkDerivation {
     libutil
     libxo
   ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
index da42260ffbad5..60e03134d36dc 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
@@ -1,6 +1,12 @@
-{ mkDerivation, libkiconv }:
+{
+  lib,
+  mkDerivation,
+  libkiconv,
+}:
 mkDerivation {
   path = "sbin/mount_msdosfs";
   extraPaths = [ "sbin/mount" ];
   buildInputs = [ libkiconv ];
+
+  meta.platforms = lib.platforms.freebsd;
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
index 92b645851b9c1..352d0e238de5e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
@@ -9,6 +9,7 @@
   id,
   protect,
   mount,
+  fsck,
 }:
 let
   rcDepsPath = lib.makeBinPath [
@@ -20,16 +21,24 @@ let
     id
     mount
     protect
+    fsck
   ];
 in
 mkDerivation {
   path = "libexec/rc";
   MK_TESTS = "no";
 
+  outputs = [
+    "out"
+    "services"
+  ];
+
   postPatch =
     ''
-      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc
-      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" --replace-fail /var $out/var
+      substituteInPlace "$BSDSRCDIR/libexec/rc/Makefile" --replace-fail /etc $out/etc
+      substituteInPlace "$BSDSRCDIR/libexec/rc/rc.d/Makefile" \
+        --replace-fail /etc $services/etc \
+        --replace-fail /var $services/var
     ''
     + (
       let
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
index c2d42af7814a4..1bb3926f2a232 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
@@ -21,6 +21,7 @@ mkDerivation {
     "lib/libc"
     "lib/liblua"
     "libexec/flua"
+    "lib/flua"
     "stand"
     "sys"
   ];
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index 5bca92269212f..62a78dcded91e 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -21,6 +21,7 @@
   file2c,
   bintrans,
   xargs-j,
+  kldxref,
 }:
 let
   hostArchBsd = freebsd-lib.mkBsdArch stdenv;
@@ -83,6 +84,7 @@ mkDerivation rec {
     file2c
     bintrans
     xargs-j
+    kldxref
   ];
 
   # --dynamic-linker /red/herring is used when building the kernel.
@@ -98,7 +100,10 @@ mkDerivation rec {
   ];
 
   # hardeningDisable = stackprotector doesn't seem to be enough, put it in cflags too
-  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+  NIX_CFLAGS_COMPILE = [
+    "-fno-stack-protector"
+    "-Wno-unneeded-internal-declaration" # some openzfs code trips this
+  ];
 
   inherit env;
   passthru.env = env;
diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json
index 3f781b4eeaf23..198b999578640 100644
--- a/pkgs/os-specific/bsd/freebsd/versions.json
+++ b/pkgs/os-specific/bsd/freebsd/versions.json
@@ -1,15 +1,15 @@
 {
   "main": {
-    "hash": "sha256-3aUsD2yRqVvb12z2XPmhE5/u4d9bqyD2ZHH3xNmwYwU=",
+    "hash": "sha256-jQpuNjo7n5b4yXGgXR9ggTkrb4r4pFPXdunBipetw+c=",
     "ref": "main",
     "refType": "branch",
-    "rev": "aa34b1d20e44141749ffdecf16908fc1e5db4db6",
+    "rev": "82283cad12a417abfb1469d899b2d7cfb1d38f77",
     "supported": false,
     "version": {
       "branch": "CURRENT",
       "major": 15,
       "minor": 0,
-      "reldate": "1500018",
+      "reldate": "1500021",
       "release": "15.0-CURRENT",
       "revision": "15.0",
       "type": "FreeBSD",
@@ -106,6 +106,24 @@
       "version": "FreeBSD 14.0-RELEASE"
     }
   },
+  "release/14.1.0": {
+    "hash": "sha256-k4Bs5zR17wHPYrL04aUyPswYGdCWVcRYZOTCDp2VTfk=",
+    "ref": "release/14.1.0",
+    "refType": "tag",
+    "rev": "10e31f0946d820d53adc58b7d013b969e4a9a8ed",
+    "supported": false,
+    "version": {
+      "branch": "RELEASE",
+      "major": 14,
+      "minor": 1,
+      "patch": 0,
+      "reldate": "1401000",
+      "release": "14.1-RELEASE",
+      "revision": "14.1",
+      "type": "FreeBSD",
+      "version": "FreeBSD 14.1-RELEASE"
+    }
+  },
   "releng/13.0": {
     "hash": "sha256-7PrqTb2o21IQgQ2N+zjavlzX/ju60Rw+MXjMRICmQi0=",
     "ref": "releng/13.0",
@@ -143,91 +161,109 @@
     }
   },
   "releng/13.2": {
-    "hash": "sha256-KN508aIe02Ue4TjlonO6TmAQ7DmiOOSOYrZfg5HP9AM=",
+    "hash": "sha256-1awVV7Zm3GfgZvefoLKrKhIOu1559mBCakmRo+oVAGA=",
     "ref": "releng/13.2",
     "refType": "branch",
-    "rev": "f5ac4e174fdd3497749e351c27aafb34171c5730",
-    "supported": true,
+    "rev": "f0cf0b8266eef39b13917f7bed808daf6d6a2d3e",
+    "supported": false,
     "version": {
-      "branch": "RELEASE-p11",
+      "branch": "RELEASE-p12",
       "major": 13,
       "minor": 2,
-      "patch": "11",
+      "patch": "12",
       "reldate": "1302001",
-      "release": "13.2-RELEASE-p11",
+      "release": "13.2-RELEASE-p12",
       "revision": "13.2",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.2-RELEASE-p11"
+      "version": "FreeBSD 13.2-RELEASE-p12"
     }
   },
   "releng/13.3": {
-    "hash": "sha256-g3i9q9XihesdfQxGy3oC7IMGtbWaLNwFlNzbdvS/4ng=",
+    "hash": "sha256-jvXIrlNmaGe4gyYCK/3wjm9JWBQOU0sD1LPxWykNddI=",
     "ref": "releng/13.3",
     "refType": "branch",
-    "rev": "be4f1894ef399f421bab451e8cf8557e27e5a948",
+    "rev": "deb948cd8dc2efb341ce96e1b7a56c9fbc662ba1",
     "supported": true,
     "version": {
-      "branch": "RELEASE-p2",
+      "branch": "RELEASE-p4",
       "major": 13,
       "minor": 3,
-      "patch": "2",
+      "patch": "4",
       "reldate": "1303001",
-      "release": "13.3-RELEASE-p2",
+      "release": "13.3-RELEASE-p4",
       "revision": "13.3",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.3-RELEASE-p2"
+      "version": "FreeBSD 13.3-RELEASE-p4"
     }
   },
   "releng/14.0": {
-    "hash": "sha256-15B9Nglshniokju88dEKj3BIffZ6L28L+ZuhAC3UqOI=",
+    "hash": "sha256-kQ3r/bnBiOZ6kpnouFLKWdpSiJe3FGWJ/XA6VRNFzEc=",
     "ref": "releng/14.0",
     "refType": "branch",
-    "rev": "d338712beb16ad7740bbd00bd93299a131a68045",
+    "rev": "5e23806790ef4825ac09b458d3df941748599fbb",
     "supported": true,
     "version": {
-      "branch": "RELEASE-p6",
+      "branch": "RELEASE-p8",
       "major": 14,
       "minor": 0,
-      "patch": "6",
+      "patch": "8",
       "reldate": "1400097",
-      "release": "14.0-RELEASE-p6",
+      "release": "14.0-RELEASE-p8",
       "revision": "14.0",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.0-RELEASE-p6"
+      "version": "FreeBSD 14.0-RELEASE-p8"
+    }
+  },
+  "releng/14.1": {
+    "hash": "sha256-rURDGcnMzUhz2I873d5ro+wGY+i8IOmiPJ5T+w4TcPA=",
+    "ref": "releng/14.1",
+    "refType": "branch",
+    "rev": "dcdea9e8623e83e3aef15fff0d6ead05382ad138",
+    "supported": true,
+    "version": {
+      "branch": "RELEASE-p2",
+      "major": 14,
+      "minor": 1,
+      "patch": "2",
+      "reldate": "1401000",
+      "release": "14.1-RELEASE-p2",
+      "revision": "14.1",
+      "type": "FreeBSD",
+      "version": "FreeBSD 14.1-RELEASE-p2"
     }
   },
   "stable/13": {
-    "hash": "sha256-ItC8haDdxMSZt1thpCrn8p0xxvs7Uqh/uNo1OwMalj8=",
+    "hash": "sha256-kbz6dpkCVYrTcPNJtKvX0TVQ4qULaOJ/WzCeQ4MYrFU=",
     "ref": "stable/13",
     "refType": "branch",
-    "rev": "825cb4c850f2b97cfd1b24ed421d7938bf37eee7",
+    "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34",
     "supported": true,
     "version": {
-      "branch": "STABLE",
+      "branch": "PRERELEASE",
       "major": 13,
-      "minor": 3,
+      "minor": 4,
       "reldate": "1303503",
-      "release": "13.3-STABLE",
-      "revision": "13.3",
+      "release": "13.4-PRERELEASE",
+      "revision": "13.4",
       "type": "FreeBSD",
-      "version": "FreeBSD 13.3-STABLE"
+      "version": "FreeBSD 13.4-PRERELEASE"
     }
   },
   "stable/14": {
-    "hash": "sha256-iAj75IXJi4Oium6BqFvsyQipDP2crBZIGg0Dac8Zf1g=",
+    "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=",
     "ref": "stable/14",
     "refType": "branch",
-    "rev": "a3b8266f5420601e231bc08c5402d9a4929fbdc0",
+    "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b",
     "supported": true,
     "version": {
-      "branch": "PRERELEASE",
+      "branch": "STABLE",
       "major": 14,
       "minor": 1,
-      "reldate": "1400511",
-      "release": "14.1-PRERELEASE",
+      "reldate": "1401501",
+      "release": "14.1-STABLE",
       "revision": "14.1",
       "type": "FreeBSD",
-      "version": "FreeBSD 14.1-PRERELEASE"
+      "version": "FreeBSD 14.1-STABLE"
     }
   }
 }
diff --git a/pkgs/os-specific/darwin/apparency/default.nix b/pkgs/os-specific/darwin/apparency/default.nix
index 54a8395f48077..8fd9af7056a5f 100644
--- a/pkgs/os-specific/darwin/apparency/default.nix
+++ b/pkgs/os-specific/darwin/apparency/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     description = "App That Opens Apps";
     homepage = "https://www.mothersruin.com/software/Apparency/";
     license = lib.licenses.unfreeRedistributable;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "appy";
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix b/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
index 113633c556313..8ae0cd649c93c 100644
--- a/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
@@ -101,7 +101,7 @@ let
 
         meta = with lib; {
           description = "Apple SDK framework ${name}";
-          maintainers = with maintainers; [ ];
+          maintainers = [ ];
           platforms = platforms.darwin;
         };
       };
diff --git a/pkgs/os-specific/darwin/defaultbrowser/default.nix b/pkgs/os-specific/darwin/defaultbrowser/default.nix
index 2246efa0aa43d..7d50924625cdf 100644
--- a/pkgs/os-specific/darwin/defaultbrowser/default.nix
+++ b/pkgs/os-specific/darwin/defaultbrowser/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Command line tool for getting and setting a default browser (HTTP handler) in Mac OS X";
     homepage = "https://github.com/kerma/defaultbrowser";
     platforms = platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix
index 21500ad16d902..367f7bc0ad444 100644
--- a/pkgs/os-specific/darwin/karabiner-elements/default.nix
+++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later";
     homepage = "https://karabiner-elements.pqrs.org/";
     platforms = platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.unlicense;
   };
 }
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
index 9134fad6012c9..41f112cf4802e 100644
--- a/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
 
     platforms = platforms.darwin;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     mainProgram = "m";
   };
 }
diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/os-specific/darwin/shortcat/default.nix
index 81086bec3a778..59009fede2b2e 100644
--- a/pkgs/os-specific/darwin/shortcat/default.nix
+++ b/pkgs/os-specific/darwin/shortcat/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://shortcat.app/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     platforms = platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.unfreeRedistributable;
   };
 }
diff --git a/pkgs/os-specific/linux/amdctl/default.nix b/pkgs/os-specific/linux/amdctl/default.nix
index f95d54e64b3ea..3d07d6be1edf7 100644
--- a/pkgs/os-specific/linux/amdctl/default.nix
+++ b/pkgs/os-specific/linux/amdctl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     mainProgram = "amdctl";
     homepage = "https://github.com/kevinlekiller/amdctl";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index bb482d34e79f3..e4bff61698348 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
     description = "Kernel module driver for some Broadcom's wireless cards";
     homepage = "http://www.broadcom.com/support/802.11/linux_sta.php";
     license = lib.licenses.unfreeRedistributable;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix
index 0530035ec3376..52ade30af0007 100644
--- a/pkgs/os-specific/linux/catfs/default.nix
+++ b/pkgs/os-specific/linux/catfs/default.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kahing/catfs";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix
index 63646007951d4..fbf7c1f48fad4 100644
--- a/pkgs/os-specific/linux/cpustat/default.nix
+++ b/pkgs/os-specific/linux/cpustat/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ColinIanKing/cpustat";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "cpustat";
   };
 }
diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix
index 925edb61472a3..02c4b3a1a7710 100644
--- a/pkgs/os-specific/linux/dddvb/default.nix
+++ b/pkgs/os-specific/linux/dddvb/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/DigitalDevices/dddvb";
     description = "ddbridge linux driver";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     broken = lib.versionAtLeast kernel.version "6.2";
   };
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index db1be06717c6e..2425a053e37a8 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "Tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix
index 39fc54d2a2c4b..c915222b1d786 100644
--- a/pkgs/os-specific/linux/dracut/default.nix
+++ b/pkgs/os-specific/linux/dracut/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dracutdevs/dracut/wiki";
     description = "Event driven initramfs infrastructure";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix
index 7fbd314a8ec7f..99a6b37e95e98 100644
--- a/pkgs/os-specific/linux/dstat/default.nix
+++ b/pkgs/os-specific/linux/dstat/default.nix
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "dstat";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     changelog = "https://github.com/dstat-real/dstat/blob/v${version}/ChangeLog";
   };
 }
diff --git a/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch b/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch
new file mode 100644
index 0000000000000..ae684d9be2340
--- /dev/null
+++ b/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch
@@ -0,0 +1,82 @@
+From 4ff06a845979bd65e672ff4ab09f5310c681e13b Mon Sep 17 00:00:00 2001
+From: Arthur Kiyanovski <akiyano@amazon.com>
+Date: Tue, 30 Jul 2024 05:06:14 +0000
+Subject: [PATCH] workaround patch for kernel 6.10
+
+Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
+---
+ kernel/linux/ena/config/test_defs.sh | 12 ++++++++++++
+ kernel/linux/ena/ena_xdp.c           |  5 ++---
+ kernel/linux/ena/kcompat.h           | 12 +++++++++++-
+ 3 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/kernel/linux/ena/config/test_defs.sh b/kernel/linux/ena/config/test_defs.sh
+index f8951c3..0cf366b 100755
+--- a/kernel/linux/ena/config/test_defs.sh
++++ b/kernel/linux/ena/config/test_defs.sh
+@@ -60,3 +60,15 @@ try_compile_async "#include <linux/etherdevice.h>"       \
+                   "ENA_HAVE_ETH_HW_ADDR_SET"             \
+                   ""                                     \
+                   "5.15.0 <= LINUX_VERSION_CODE"
++
++try_compile_async "#include <net/xdp_sock_drv.h>"        \
++                  "xsk_buff_dma_sync_for_cpu(NULL);"     \
++                  "ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG"     \
++                  ""                                     \
++                  "6.10.0 <= LINUX_VERSION_CODE"
++
++try_compile_async "#include <linux/skbuff.h>"            \
++                  "__napi_alloc_skb(NULL, 0, 0);"        \
++                  "ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK" \
++                  ""                                     \
++                  "6.10.0 > LINUX_VERSION_CODE"
+diff --git a/kernel/linux/ena/ena_xdp.c b/kernel/linux/ena/ena_xdp.c
+index 204389f..ecbaa9f 100644
+--- a/kernel/linux/ena/ena_xdp.c
++++ b/kernel/linux/ena/ena_xdp.c
+@@ -746,9 +746,8 @@ static struct sk_buff *ena_xdp_rx_skb_zc(struct ena_ring *rx_ring, struct xdp_bu
+ 	data_addr = xdp->data;
+ 
+ 	/* allocate a skb to store the frags */
+-	skb = __napi_alloc_skb(rx_ring->napi,
+-			       headroom + data_len,
+-			       GFP_ATOMIC | __GFP_NOWARN);
++	skb = napi_alloc_skb(rx_ring->napi,
++			     headroom + data_len);
+ 	if (unlikely(!skb)) {
+ 		ena_increase_stat(&rx_ring->rx_stats.skb_alloc_fail, 1,
+ 				  &rx_ring->syncp);
+diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h
+index 6d5a069..7511087 100644
+--- a/kernel/linux/ena/kcompat.h
++++ b/kernel/linux/ena/kcompat.h
+@@ -998,10 +998,11 @@ static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2)
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)) && \
+ 	!(RHEL_RELEASE_CODE && \
+ 	(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 2)))
++#define ENA_KCOMAPT_NAPI_ALLOC_SKB
+ static inline struct sk_buff *napi_alloc_skb(struct napi_struct *napi,
+ 					     unsigned int length)
+ {
+-	return netdev_alloc_skb_ip_align(napi->dev, length);
++	return __netdev_alloc_skb_ip_align(napi->dev, length, GFP_ATOMIC | __GFP_NOWARN);
+ }
+ #endif
+ 
+@@ -1150,4 +1151,13 @@ static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumas
+ #define ethtool_puts ethtool_sprintf
+ #endif /* ENA_HAVE_ETHTOOL_PUTS */
+ 
++#ifdef ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG
++#include <net/xdp_sock_drv.h>
++#define xsk_buff_dma_sync_for_cpu(xdp, xsk_pool) xsk_buff_dma_sync_for_cpu(xdp)
++#endif /* ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG */
++
++#if defined(ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK) && !defined(ENA_KCOMAPT_NAPI_ALLOC_SKB)
++#define napi_alloc_skb(napi, len) __napi_alloc_skb(napi, len, GFP_ATOMIC | __GFP_NOWARN)
++#endif /* ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK && !ENA_KCOMAPT_NAPI_ALLOC_SKB*/
++
+ #endif /* _KCOMPAT_H_ */
+-- 
+2.40.1
+
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index 9ce71745cdcfd..4b0af2879144c 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, kernel }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  kernel,
+}:
 
 stdenv.mkDerivation rec {
-  version = "2.12.0";
+  version = "2.12.3";
   name = "ena-${version}-${kernel.version}";
 
   src = fetchFromGitHub {
     owner = "amzn";
     repo = "amzn-drivers";
     rev = "ena_linux_${version}";
-    hash = "sha256-Z/eeIUY7Yl2l/IqK3Z2nxPhn+JLvP976IZ9ZXPBqoSo=";
+    hash = "sha256-F8vDPPwO0PnGXhqt0EeT4m/+d8w/rjMHWRV3RYC/wVQ=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -16,20 +21,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = kernel.moduleBuildDependencies;
   makeFlags = kernel.makeFlags;
 
-  # linux 3.12
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+  env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 
   patches = [
-    # Use kernel version checks instead of API feature detection
-    # See https://github.com/NixOS/nixpkgs/pull/310680
-    ./override-features-api-detection.patch
+    # https://github.com/amzn/amzn-drivers/issues/313
+    ./0001-workaround-patch-for-kernel-6.10.patch
   ];
 
   configurePhase = ''
     runHook preConfigure
     cd kernel/linux/ena
     export ENA_PHC_INCLUDE=1
-    substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion}
     runHook postConfigure
   '';
 
@@ -47,7 +49,11 @@ stdenv.mkDerivation rec {
     description = "Amazon Elastic Network Adapter (ENA) driver for Linux";
     homepage = "https://github.com/amzn/amzn-drivers";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ eelco sielicki ];
+    maintainers = with maintainers; [
+      eelco
+      sielicki
+      arianvp
+    ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/ena/override-features-api-detection.patch b/pkgs/os-specific/linux/ena/override-features-api-detection.patch
deleted file mode 100644
index 099530b121717..0000000000000
--- a/pkgs/os-specific/linux/ena/override-features-api-detection.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h
-index 32a9cc5..8d39362 100644
---- a/kernel/linux/ena/kcompat.h
-+++ b/kernel/linux/ena/kcompat.h
-@@ -888,21 +888,6 @@ xdp_prepare_buff(struct xdp_buff *xdp, unsigned char *hard_start,
- #define ENA_XDP_XMIT_FREES_FAILED_DESCS_INTERNALLY
- #endif
- 
--#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && \
--	!(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 188) && \
--	 LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) && \
--	!(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 251) && \
--	 LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0))) && \
--	!(defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6)) && \
--	!(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL >= 4)) && \
--	!(defined(SUSE_VERSION) && (SUSE_VERSION == 15 && SUSE_PATCHLEVEL == 3) && \
--	  ENA_KERNEL_VERSION_GTE(5, 3, 18, 150300, 59, 43))
--static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr)
--{
--	memcpy(dev->dev_addr, addr, ETH_ALEN);
--}
--#endif
--
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) || \
- 	(defined(RHEL_RELEASE_CODE) && \
- 	RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 6) && \
-@@ -1112,7 +1097,7 @@ static inline void ena_dma_unmap_page_attrs(struct device *dev,
- #define pci_dev_id(pdev) ((((u16)(pdev->bus->number)) << 8) | (pdev->devfn))
- #endif /* ENA_HAVE_PCI_DEV_ID */
- 
--#ifndef ENA_HAVE_XDP_DO_FLUSH
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
- #define xdp_do_flush xdp_do_flush_map
- #endif /* ENA_HAVE_XDP_DO_FLUSH */
- 
-@@ -1147,15 +1132,15 @@ static inline unsigned int cpumask_local_spread(unsigned int i, int node)
- }
- #endif /* ENA_HAVE_CPUMASK_LOCAL_SPREAD */
- 
--#ifndef ENA_HAVE_UPDATE_AFFINITY_HINT
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
- static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumask *m)
- {
- 	return 0;
- }
--#endif /* ENA_HAVE_UPDATE_AFFINITY_HINT */
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5.17.0) */
- 
--#ifndef ENA_HAVE_ETHTOOL_PUTS
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0)
- #define ethtool_puts ethtool_sprintf
--#endif /* ENA_HAVE_ETHTOOL_PUTS */
-+#endif
- 
- #endif /* _KCOMPAT_H_ */
diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/os-specific/linux/ethq/default.nix
index 94f18cccd9439..37d0767834dbc 100644
--- a/pkgs/os-specific/linux/ethq/default.nix
+++ b/pkgs/os-specific/linux/ethq/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/isc-projects/ethq";
     license = licenses.mpl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index be7b9f37e1ef2..7a7a5112374a2 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Extensible Virtual Display Interface";
     homepage = "https://www.displaylink.com/";
     license = with licenses; [ lgpl21Only gpl2Only ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 })
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index beb3cc6e97143..e54135f3e72ed 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ColinIanKing/eventstat";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
index 0faec11702211..972f8a9764b58 100644
--- a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://fwupd.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
index 31ac23df39606..4c3bede4fba23 100644
--- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     sourceProvenance = with sourceTypes; [
       binaryFirmware
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 })
diff --git a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
index 3ad52b314537d..9674cea2226ff 100644
--- a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     sourceProvenance = with sourceTypes; [
       binaryFirmware
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
index 4ff7bf48b920c..3f1a0ed04bb17 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/raspberrypi/tools";
     license = licenses.bsd3;
     platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/os-specific/linux/gt/default.nix
index e5a6967579808..964566b57d06c 100644
--- a/pkgs/os-specific/linux/gt/default.nix
+++ b/pkgs/os-specific/linux/gt/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Linux command line tool for setting up USB gadgets using configfs";
     mainProgram = "gt";
     license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/os-specific/linux/hostapd/0007-RADIUS-Require-Message-Authenticator-attribute-in-MA.patch b/pkgs/os-specific/linux/hostapd/0007-RADIUS-Require-Message-Authenticator-attribute-in-MA.patch
deleted file mode 100644
index e895e47925679..0000000000000
--- a/pkgs/os-specific/linux/hostapd/0007-RADIUS-Require-Message-Authenticator-attribute-in-MA.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 58097123ec5ea6f8276b38cb9b07669ec368a6c1 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 17 Mar 2024 10:42:56 +0200
-Subject: [PATCH 7/8] RADIUS: Require Message-Authenticator attribute in MAC
- ACL cases
-
-hostapd required Message-Authenticator attribute to be included in EAP
-authentication cases, but that requirement was not in place for MAC ACL
-cases. Start requiring Message-Authenticator attribute for MAC ACL by
-default. Unlike the EAP case, this can still be disabled with
-radius_require_message_authenticator=1 to maintain compatibility with
-some RADIUS servers when used in a network where the connection to such
-a server is secure.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- hostapd/config_file.c    |  3 +++
- hostapd/hostapd.conf     | 11 +++++++++++
- src/ap/ap_config.c       |  1 +
- src/ap/ap_config.h       |  1 +
- src/ap/ieee802_11_auth.c |  4 +++-
- 5 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/hostapd/config_file.c b/hostapd/config_file.c
-index 96c28aea2..3fb059770 100644
---- a/hostapd/config_file.c
-+++ b/hostapd/config_file.c
-@@ -2988,6 +2988,9 @@ static int hostapd_config_fill(struct hostapd_config *conf,
- #endif /* CONFIG_RADIUS_TLS */
- 	} else if (os_strcmp(buf, "radius_retry_primary_interval") == 0) {
- 		bss->radius->retry_primary_interval = atoi(pos);
-+	} else if (os_strcmp(buf,
-+			     "radius_require_message_authenticator") == 0) {
-+		bss->radius_require_message_authenticator = atoi(pos);
- 	} else if (os_strcmp(buf, "radius_acct_interim_interval") == 0) {
- 		bss->acct_interim_interval = atoi(pos);
- 	} else if (os_strcmp(buf, "radius_request_cui") == 0) {
-diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
-index e3367b708..3f0e66beb 100644
---- a/hostapd/hostapd.conf
-+++ b/hostapd/hostapd.conf
-@@ -1620,6 +1620,17 @@ own_ip_addr=127.0.0.1
- # currently used secondary server is still working.
- #radius_retry_primary_interval=600
- 
-+# Message-Authenticator attribute requirement for non-EAP cases
-+# hostapd requires Message-Authenticator attribute to be included in all cases
-+# where RADIUS is used for EAP authentication. This is also required for cases
-+# where RADIUS is used for MAC ACL (macaddr_acl=2) by default, but that case
-+# can be configured to not require this for compatibility with RADIUS servers
-+# that do not include the attribute. This is not recommended due to potential
-+# security concerns, but can be used as a temporary workaround in networks where
-+# the connection to the RADIUS server is secure.
-+# 0 = Do not require Message-Authenticator in MAC ACL response
-+# 1 = Require Message-Authenticator in all authentication cases (default)
-+#radius_require_message_authenticator=1
- 
- # Interim accounting update interval
- # If this is set (larger than 0) and acct_server is configured, hostapd will
-diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
-index 32b04ab35..0b5a16ef9 100644
---- a/src/ap/ap_config.c
-+++ b/src/ap/ap_config.c
-@@ -122,6 +122,7 @@ void hostapd_config_defaults_bss(struct hostapd_bss_config *bss)
- #endif /* CONFIG_IEEE80211R_AP */
- 
- 	bss->radius_das_time_window = 300;
-+	bss->radius_require_message_authenticator = 1;
- 
- 	bss->anti_clogging_threshold = 5;
- 	bss->sae_sync = 5;
-diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
-index fda937ecf..ced2181ab 100644
---- a/src/ap/ap_config.h
-+++ b/src/ap/ap_config.h
-@@ -309,6 +309,7 @@ struct hostapd_bss_config {
- 	struct hostapd_ip_addr own_ip_addr;
- 	char *nas_identifier;
- 	struct hostapd_radius_servers *radius;
-+	int radius_require_message_authenticator;
- 	int acct_interim_interval;
- 	int radius_request_cui;
- 	struct hostapd_radius_attr *radius_auth_req_attr;
-diff --git a/src/ap/ieee802_11_auth.c b/src/ap/ieee802_11_auth.c
-index cc38044d8..913a99597 100644
---- a/src/ap/ieee802_11_auth.c
-+++ b/src/ap/ieee802_11_auth.c
-@@ -508,7 +508,9 @@ hostapd_acl_recv_radius(struct radius_msg *msg, struct radius_msg *req,
- 	wpa_printf(MSG_DEBUG, "Found matching Access-Request for RADIUS "
- 		   "message (id=%d)", query->radius_id);
- 
--	if (radius_msg_verify(msg, shared_secret, shared_secret_len, req, 0)) {
-+	if (radius_msg_verify(
-+		    msg, shared_secret, shared_secret_len, req,
-+		    hapd->conf->radius_require_message_authenticator)) {
- 		wpa_printf(MSG_INFO, "Incoming RADIUS packet did not have "
- 			   "correct authenticator - dropped\n");
- 		return RADIUS_RX_INVALID_AUTHENTICATOR;
--- 
-2.45.1
-
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 5988dc0436dcb..10abb04f776fc 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   pkg-config,
   libnl,
   openssl,
@@ -12,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hostapd";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchurl {
     url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-IG58eZtnhXLC49EgMCOHhLxKn4IyOwFWtMlGbxSYkV0=";
+    sha256 = "sha256-Kz+stjL9T2XjL0v4Kna0tyxQH5laT2LjMCGf567RdHo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -29,53 +28,6 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/openwrt/openwrt/eefed841b05c3cd4c65a78b50ce0934d879e6acf/package/network/services/hostapd/patches/300-noscan.patch";
       sha256 = "08p5frxhpq1rp2nczkscapwwl8g9nc4fazhjpxic5bcbssc3sb00";
     })
-
-    # Backported security patches for CVE-2024-3596 (https://blastradius.fail),
-    # these can be removed when updating to 2.11.
-
-    # RADIUS: Allow Message-Authenticator attribute as the first attribute
-    (fetchpatch {
-      url = "https://w1.fi/cgit/hostap/patch/?id=adac846bd0e258a0aa50750bbd2b411fa0085c46";
-      hash = "sha256-1jfSeVGL5tyZn8F2wpQ7KwaQaEKWsCOW/bavovMcdz4=";
-    })
-
-    # RADIUS server: Place Message-Authenticator attribute as the first one
-    (fetchpatch {
-      url = "https://w1.fi/cgit/hostap/patch/?id=54abb0d3cf35894e7d86e3f7555e95b106306803";
-      hash = "sha256-fVhQlOVETttVf1M9iKrXJrv7mxpxSjCt3w8kndRal08=";
-    })
-
-    # hostapd: Move Message-Authenticator attribute to be the first one in req
-    (fetchpatch {
-      url = "https://w1.fi/cgit/hostap/patch/?id=37fe8e48ab44d44fe3cf5dd8f52cb0a10be0cd17";
-      hash = "sha256-3eoAkXhieO3f0R5PTlH6g5wcgo/aLQN6XcPSITGgciE=";
-    })
-
-    # RADIUS DAS: Move Message-Authenticator attribute to be the first one
-    (fetchpatch {
-      url = "https://w1.fi/cgit/hostap/patch/?id=f54157077f799d84ce26bed6ad6b01c4a16e31cf";
-      hash = "sha256-dcaghKbKNFVSN6ONNaFt1s0S35mkqox2aykiExEXyPQ=";
-    })
-
-    # Require Message-Authenticator in Access-Reject even without EAP-Message
-    (fetchpatch {
-      url = "https://w1.fi/cgit/hostap/patch/?id=934b0c3a45ce0726560ccefbd992a9d385c36385";
-      hash = "sha256-9GquP/+lsghF81nMhOuRwlSz/pEnmk+mSex8aM3/qdA=";
-    })
-
-    # RADIUS: Require Message-Authenticator attribute in MAC ACL cases
-    #(fetchpatch {
-    #  url = "https://w1.fi/cgit/hostap/patch/?id=58097123ec5ea6f8276b38cb9b07669ec368a6c1";
-    #  hash = "sha256-mW+PAeAkNcrlFPsjxLvZ/1Smq6H6KXq5Le3HuLA2KKw=";
-    #})
-    # Needed to be fixed to apply correctly:
-    ./0007-RADIUS-Require-Message-Authenticator-attribute-in-MA.patch
-
-    # RADIUS: Check Message-Authenticator if it is present even if not required
-    (fetchpatch {
-      url = "https://w1.fi/cgit/hostap/patch/?id=f302d9f9646704cce745734af21d540baa0da65f";
-      hash = "sha256-6i0cq5YBm2w03yMrdYGaEqe1dTsmokZWOs4WPFX36qo=";
-    })
   ];
 
   outputs = [ "out" "man" ];
@@ -137,6 +89,7 @@ stdenv.mkDerivation rec {
     CONFIG_IEEE80211N=y
     CONFIG_IEEE80211AC=y
     CONFIG_IEEE80211AX=y
+    CONFIG_IEEE80211BE=y
   '' + lib.optionalString (sqlite != null) ''
     CONFIG_SQLITE=y
   '';
diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix
index a5e24b1eb2936..68ce1add6a4ef 100644
--- a/pkgs/os-specific/linux/i810switch/default.nix
+++ b/pkgs/os-specific/linux/i810switch/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Utility for switching between the LCD and external VGA display on Intel graphics cards";
     homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Only;
     platforms = platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix
index cb1cf06b530e9..304f27dfb43cd 100644
--- a/pkgs/os-specific/linux/ipu6-drivers/default.nix
+++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/intel/ipu6-drivers";
     description = "IPU6 kernel driver";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     # requires 6.1.7 https://github.com/intel/ipu6-drivers/pull/84
     broken = kernel.kernelOlder "6.1.7";
diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix
index 1308ff5f37cf4..74ad354a984f4 100644
--- a/pkgs/os-specific/linux/ivsc-driver/default.nix
+++ b/pkgs/os-specific/linux/ivsc-driver/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/intel/ivsc-driver";
     description = "Intel Vision Sensing Controller kernel driver";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     broken = kernel.kernelOlder "5.15";
   };
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 3506d0937af80..3ed0e9a75e180 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.10-rc7",
-        "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19"
+        "version": "6.11-rc1",
+        "hash": "sha256:0c9an2xlils8lk9yx883jb3li6ylj4k1jpbqp5k0z71xifa5fxb1"
     },
     "6.1": {
         "version": "6.1.102",
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index ac18aa2634e75..00cda68dc4067 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.1.99-rt36"; # updated by ./update-rt.sh
+  version = "6.1.102-rt37"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1lsdwdx7i7xw1rzq88k3bz8sar77gb4rnmjx11pbmvmiwaffx1n0";
+    sha256 = "1v4p4i8pfg4i6v90dr7m65npkxjnqv3fxcj8zs3pbb8y84xzk98v";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "17a468lar9kf0q6n3vmknrbasrwp6pmq2gg39n1sp1bmmpr43qsf";
+      sha256 = "07cpbq8jrwqmv15qm2szrgqwgy33kxwglxll93cqqnklr4in1lmy";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index 710e7d9562474..3fce66f2471cb 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.6.41-rt37"; # updated by ./update-rt.sh
+  version = "6.6.43-rt38"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1vrjw0yhzmmnbrxyzjrfyz1s8bixciv1ly9pkgcqbasqh5brrjcy";
+    sha256 = "0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0b2l0bdyb49x7by8wamqfr3yhy722pz55k5a9bvq8pvmqn9s8a3b";
+      sha256 = "0flxji623fy11l7z2syj5nlpkjfrc2nkqfpqvbgwzqpzms028mzj";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 
diff --git a/pkgs/os-specific/linux/kernel/update-mainline.py b/pkgs/os-specific/linux/kernel/update-mainline.py
index 79ac283faab6e..320d5065fefa5 100755
--- a/pkgs/os-specific/linux/kernel/update-mainline.py
+++ b/pkgs/os-specific/linux/kernel/update-mainline.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.lxml ps.packaging ])"
+from functools import cached_property
 from itertools import groupby
 import json
 import os
@@ -29,20 +30,33 @@ class KernelNature(Enum):
 class KernelRelease:
     nature: KernelNature
     version: str
-    branch: str
     date: str
     link: str
     eol: bool = False
 
+    @cached_property
+    def parsed_version(self) -> Version:
+        return parse_version(self.version)
+
+    @cached_property
+    def branch(self) -> str:
+        version = self.parsed_version
+        # This is a testing kernel.
+        if version.is_prerelease:
+            return "testing"
+        else:
+            return f"{version.major}.{version.minor}"
+
 
 def parse_release(release: Tag) -> KernelRelease | None:
     columns: list[Tag] = list(release.find_all("td"))
     try:
         nature = KernelNature[columns[0].get_text().rstrip(":").upper()]
     except KeyError:
+        # skip linux-next
         return None
 
-    version = parse_version(columns[1].get_text().rstrip(" [EOL]"))
+    version = columns[1].get_text().rstrip(" [EOL]")
     date = columns[2].get_text()
     link = columns[3].find("a")
     if link is not None and isinstance(link, Tag):
@@ -52,7 +66,6 @@ def parse_release(release: Tag) -> KernelRelease | None:
 
     return KernelRelease(
         nature=nature,
-        branch=get_branch(version),
         version=version,
         date=date,
         link=link,
@@ -60,14 +73,6 @@ def parse_release(release: Tag) -> KernelRelease | None:
     )
 
 
-def get_branch(version: Version):
-    # This is a testing kernel.
-    if version.is_prerelease:
-        return "testing"
-    else:
-        return f"{version.major}.{version.minor}"
-
-
 def get_hash(kernel: KernelRelease):
     if kernel.branch == "testing":
         args = ["--unpack"]
@@ -108,16 +113,19 @@ def main():
         sys.exit(1)
 
     releases = release_table.find_all("tr")
-    parsed_releases = filter(None, [parse_release(release) for release in releases])
+    parsed_releases = [
+        parsed for release in releases
+        if (parsed := parse_release(release)) is not None
+    ]
     all_kernels = json.load(VERSIONS_FILE.open())
 
     oldest_branch = get_oldest_branch()
 
-    for (branch, kernels) in groupby(parsed_releases, lambda kernel: get_branch(kernel.version)):
-        kernel = max(kernels, key=lambda kernel: kernel.version)
+    for (branch, kernels) in groupby(parsed_releases, lambda kernel: kernel.branch):
+        kernel = max(kernels, key=lambda kernel: kernel.parsed_version)
         nixpkgs_branch = branch.replace(".", "_")
 
-        old_version = parse_version(all_kernels.get(branch, {}).get("version"))
+        old_version = all_kernels.get(branch, {}).get("version")
         if old_version == kernel.version:
             print(f"linux_{nixpkgs_branch}: {kernel.version} is latest, skipping...")
             continue
@@ -144,7 +152,7 @@ def main():
         print(message, file=sys.stderr)
 
         all_kernels[branch] = {
-            "version": str(kernel.version),
+            "version": kernel.version,
             "hash": get_hash(kernel),
         }
 
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix
index d2cccef37b894..4986f0abf4a34 100644
--- a/pkgs/os-specific/linux/libaio/default.nix
+++ b/pkgs/os-specific/linux/libaio/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "https://lse.sourceforge.net/io/aio.html";
     platforms = lib.platforms.linux;
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 9f0bfacf07d3c..cf01f43ca7fc9 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dell/libsmbios";
     description = "Library to obtain BIOS information";
     license = with licenses; [ osl21 gpl2Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 4992fdbf1d46e..0178e3e751a10 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dgraziotin/mbpfan";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 6e133564e28ce..eea619f78356c 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     description = "Microcode for Intel processors";
     license = licenses.unfreeRedistributableFirmware;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index 0b03aeb3c2d07..f781366e1945e 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     description = "Connect external monitors via Wi-Fi";
     homepage    = "https://github.com/albfan/miraclecast";
     license     = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix
index 0a52222cebcef..99c34a7f2f984 100644
--- a/pkgs/os-specific/linux/numad/default.nix
+++ b/pkgs/os-specific/linux/numad/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     homepage = "https://fedoraproject.org/wiki/Features/numad";
     license = licenses.lgpl21;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index dea9ab721a957..06303d0337fd7 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -112,16 +112,17 @@ installPhase() {
 
         # EGL
         if [ "$useGLVND" = "1" ]; then
-            sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed
-            sed -E "s#(libnvidia-egl-wayland)#$i/lib/\\1#" 10_nvidia_wayland.json > 10_nvidia_wayland.json.fixed
+            mkdir -p "$i/share/egl/egl_external_platform.d"
+            for icdname in $(find . -name '*_nvidia*.json')
+            do
+                cat "$icdname" | jq ".ICD.library_path |= \"$i/lib/\(.)\"" | tee "$i/share/egl/egl_external_platform.d/$icdname"
+            done
 
-            install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/10_nvidia.json
-            install -Dm644 10_nvidia_wayland.json.fixed $i/share/egl/egl_external_platform.d/10_nvidia_wayland.json
-
-            if [[ -f "15_nvidia_gbm.json" ]]; then
-              sed -E "s#(libnvidia-egl-gbm)#$i/lib/\\1#" 15_nvidia_gbm.json > 15_nvidia_gbm.json.fixed
-              install -Dm644 15_nvidia_gbm.json.fixed $i/share/egl/egl_external_platform.d/15_nvidia_gbm.json
+            # glvnd icd
+            mkdir -p "$i/share/glvnd/egl_vendor.d"
+            mv "$i/share/egl/egl_external_platform.d/10_nvidia.json" "$i/share/glvnd/egl_vendor.d/10_nvidia.json"
 
+            if [[ -f "$i/share/egl/egl_external_platform.d/15_nvidia_gbm.json" ]]; then
               mkdir -p $i/lib/gbm
               ln -s $i/lib/libnvidia-allocator.so $i/lib/gbm/nvidia-drm_gbm.so
             fi
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 568027999efa3..612fa587402c1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -33,12 +33,12 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
   production = generic {
-    version = "550.100";
-    sha256_64bit = "sha256-imtfsoe/EfUFZzR4S9pkwQZKCcKqefayJewPtW0jgC0=";
-    sha256_aarch64 = "sha256-AWHdMtCci8i7maNjVapOT6kyVuFaP81jJyTRLjEyMzo=";
-    openSha256 = "sha256-3g0f88xGMTB0mx4kVan3ipLtnJFFIKi58ss/1lqC3Sw=";
-    settingsSha256 = "sha256-cDxhzZCDLtXOas5OlodNYGIuscpKmIGyvhC/kAQaxLc=";
-    persistencedSha256 = "sha256-gXHBR2+1+YZE2heRArfrZpEF3rO7R92ChuQN+ISpil8=";
+    version = "550.107.02";
+    sha256_64bit = "sha256-+XwcpN8wYCjYjHrtYx+oBhtVxXxMI02FO1ddjM5sAWg=";
+    sha256_aarch64 = "sha256-mVEeFWHOFyhl3TGx1xy5EhnIS/nRMooQ3+LdyGe69TQ=";
+    openSha256 = "sha256-Po+pASZdBaNDeu5h8sgYgP9YyFAm9ywf/8iyyAaLm+w=";
+    settingsSha256 = "sha256-WFZhQZB6zL9d5MUChl2kCKQ1q9SgD0JlP4CMXEwp2jE=";
+    persistencedSha256 = "sha256-Vz33gNYapQ4++hMqH3zBB4MyjxLxwasvLzUJsCcyY4k=";
   };
 
   latest = selectHighestVersion production (generic {
@@ -51,12 +51,12 @@ rec {
   });
 
   beta = selectHighestVersion latest (generic {
-    version = "555.52.04";
-    sha256_64bit = "sha256-nVOubb7zKulXhux9AruUTVBQwccFFuYGWrU1ZiakRAI=";
-    sha256_aarch64 = "sha256-Kt60kTTO3mli66De2d1CAoE3wr0yUbBe7eqCIrYHcWk=";
-    openSha256 = "sha256-wDimW8/rJlmwr1zQz8+b1uvxxxbOf3Bpk060lfLKuy0=";
-    settingsSha256 = "sha256-PMh5efbSEq7iqEMBr2+VGQYkBG73TGUh6FuDHZhmwHk=";
-    persistencedSha256 = "sha256-KAYIvPjUVilQQcD04h163MHmKcQrn2a8oaXujL2Bxro=";
+    version = "560.28.03";
+    sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
+    sha256_aarch64 = "sha256-+u0ZolZcZoej4nqPGmZn5qpyynLvu2QSm9Rd3wLdDmM=";
+    openSha256 = "sha256-asGpqOpU0tIO9QqceA8XRn5L27OiBFuI9RZ1NjSVwaM=";
+    settingsSha256 = "sha256-b4nhUMCzZc3VANnNb0rmcEH6H7SK2D5eZIplgPV59c8=";
+    persistencedSha256 = "sha256-MhITuC8tH/IPhCOUm60SrPOldOpitk78mH0rg+egkTE=";
   });
 
   # Vulkan developer beta driver
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 3f6c5d1caaa30..5907c6e81e430 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -41,6 +41,7 @@
 , nukeReferences
 , which
 , libarchive
+, jq
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
   # Linux.
@@ -175,7 +176,7 @@ let
     libPath = libPathFor pkgs;
     libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux);
 
-    nativeBuildInputs = [ perl nukeReferences which libarchive ]
+    nativeBuildInputs = [ perl nukeReferences which libarchive jq ]
       ++ optionals (!libsOnly) kernel.moduleBuildDependencies;
 
     disallowedReferences = optionals (!libsOnly) [ kernel.dev ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index fcb804cad6f1d..df05a859b4c9c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -9,6 +9,7 @@ nvidia_x11: sha256:
 , jansson
 , gtk2
 , dbus
+, vulkan-headers
 , gtk3
 , libXv
 , libXrandr
@@ -117,7 +118,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkg-config m4 addDriverRunpath ]
     ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
 
-  buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 dbus ]
+  buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 dbus vulkan-headers ]
     ++ lib.optionals (withGtk2 || lib.versionOlder nvidia_x11.settingsVersion "525.53") [ gtk2 ]
     ++ lib.optionals withGtk3 [ gtk3 librsvg ];
 
diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix
index 12920c0c342ea..337e422eebdd1 100644
--- a/pkgs/os-specific/linux/otpw/default.nix
+++ b/pkgs/os-specific/linux/otpw/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     mainProgram = "otpw-gen";
     homepage = "http://www.cl.cam.ac.uk/~mgk25/otpw.html";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 0394a3311ba27..53ed1e5a342ca 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = "https://ghedo.github.io/pflask/";
     license = lib.licenses.bsd2;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix
index 56d192ad308b4..fa3698b362061 100644
--- a/pkgs/os-specific/linux/pipework/default.nix
+++ b/pkgs/os-specific/linux/pipework/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/jpetazzo/pipework";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index 274fcd06ffefa..9806ddebb8d31 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     broken = lib.versionAtLeast kernel.modDirVersion "6.9";
   };
 }
diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/os-specific/linux/restool/default.nix
index 7f7c094007e47..98e4a9c325296 100644
--- a/pkgs/os-specific/linux/restool/default.nix
+++ b/pkgs/os-specific/linux/restool/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/nxp-qoriq/restool";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/unscd/default.nix b/pkgs/os-specific/linux/unscd/default.nix
index 9f77fa01b0ee5..e38421071422d 100644
--- a/pkgs/os-specific/linux/unscd/default.nix
+++ b/pkgs/os-specific/linux/unscd/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     mainProgram = "nscd";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/os-specific/linux/usbtop/default.nix
index 587d82d9e7ebc..af16a701383a9 100644
--- a/pkgs/os-specific/linux/usbtop/default.nix
+++ b/pkgs/os-specific/linux/usbtop/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/aguinet/usbtop";
     description = "Top utility that shows an estimated instantaneous bandwidth on USB buses and devices";
     mainProgram = "usbtop";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix
index f4430f3224aeb..7c0a4f1ed1f54 100644
--- a/pkgs/os-specific/linux/vendor-reset/default.nix
+++ b/pkgs/os-specific/linux/vendor-reset/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Linux kernel vendor specific hardware reset module";
     homepage = "https://github.com/gnif/vendor-reset";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     broken = kernel.kernelOlder "4.19";
   };
diff --git a/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch b/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch
deleted file mode 100644
index d459de8a7f39e..0000000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 99ae610f0ae3608a12c864caedf396f14e68327d Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Fri, 19 Feb 2021 19:44:21 +0100
-Subject: [PATCH] Implement read-only mode for ssids
-
-With this change it's possible to define `network=`-sections in a second
-config file specified via `-I` without having changes written to
-`/etc/wpa_supplicant.conf`.
-
-This is helpful on e.g. NixOS to allow both declarative (i.e. read-only)
-and imperative (i.e. mutable) networks.
----
- wpa_supplicant/config.h         | 2 +-
- wpa_supplicant/config_file.c    | 5 +++--
- wpa_supplicant/config_none.c    | 2 +-
- wpa_supplicant/config_ssid.h    | 2 ++
- wpa_supplicant/wpa_supplicant.c | 8 ++++----
- 5 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h
-index 6a297ecfe..adaf4d398 100644
---- a/wpa_supplicant/config.h
-+++ b/wpa_supplicant/config.h
-@@ -1614,7 +1614,7 @@ const char * wpa_config_get_global_field_name(unsigned int i, int *no_var);
-  *
-  * Each configuration backend needs to implement this function.
-  */
--struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp);
-+struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro);
- 
- /**
-  * wpa_config_write - Write or update configuration data
-diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
-index 77c326df5..d5ed051b9 100644
---- a/wpa_supplicant/config_file.c
-+++ b/wpa_supplicant/config_file.c
-@@ -373,7 +373,7 @@ static int wpa_config_process_blob(struct wpa_config *config, FILE *f,
- #endif /* CONFIG_NO_CONFIG_BLOBS */
- 
- 
--struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
-+struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro)
- {
- 	FILE *f;
- 	char buf[512], *pos;
-@@ -415,6 +415,7 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
- 	while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) {
- 		if (os_strcmp(pos, "network={") == 0) {
- 			ssid = wpa_config_read_network(f, &line, id++);
-+			ssid->ro = ro;
- 			if (ssid == NULL) {
- 				wpa_printf(MSG_ERROR, "Line %d: failed to "
- 					   "parse network block.", line);
-@@ -1591,7 +1592,7 @@ int wpa_config_write(const char *name, struct wpa_config *config)
- 	}
- 
- 	for (ssid = config->ssid; ssid; ssid = ssid->next) {
--		if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary)
-+		if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary || ssid->ro)
- 			continue; /* do not save temporary networks */
- 		if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set &&
- 		    !ssid->passphrase)
-diff --git a/wpa_supplicant/config_none.c b/wpa_supplicant/config_none.c
-index 2aac28fa3..02191b425 100644
---- a/wpa_supplicant/config_none.c
-+++ b/wpa_supplicant/config_none.c
-@@ -17,7 +17,7 @@
- #include "base64.h"
- 
- 
--struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
-+struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro)
- {
- 	struct wpa_config *config;
- 
-diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
-index d5c5c00a9..fd80c079c 100644
---- a/wpa_supplicant/config_ssid.h
-+++ b/wpa_supplicant/config_ssid.h
-@@ -93,6 +93,8 @@ struct wpa_ssid {
- 	 */
- 	int id;
- 
-+	int ro;
-+
- 	/**
- 	 * priority - Priority group
- 	 *
-diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
-index 911d79d17..cb0cb99b1 100644
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1052,14 +1052,14 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s)
- 
- 	if (wpa_s->confname == NULL)
- 		return -1;
--	conf = wpa_config_read(wpa_s->confname, NULL);
-+	conf = wpa_config_read(wpa_s->confname, NULL, 0);
- 	if (conf == NULL) {
- 		wpa_msg(wpa_s, MSG_ERROR, "Failed to parse the configuration "
- 			"file '%s' - exiting", wpa_s->confname);
- 		return -1;
- 	}
- 	if (wpa_s->confanother &&
--	    !wpa_config_read(wpa_s->confanother, conf)) {
-+	    !wpa_config_read(wpa_s->confanother, conf, 1)) {
- 		wpa_msg(wpa_s, MSG_ERROR,
- 			"Failed to parse the configuration file '%s' - exiting",
- 			wpa_s->confanother);
-@@ -5638,7 +5638,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
- #else /* CONFIG_BACKEND_FILE */
- 		wpa_s->confname = os_strdup(iface->confname);
- #endif /* CONFIG_BACKEND_FILE */
--		wpa_s->conf = wpa_config_read(wpa_s->confname, NULL);
-+		wpa_s->conf = wpa_config_read(wpa_s->confname, NULL, 0);
- 		if (wpa_s->conf == NULL) {
- 			wpa_printf(MSG_ERROR, "Failed to read or parse "
- 				   "configuration '%s'.", wpa_s->confname);
-@@ -5646,7 +5646,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
- 		}
- 		wpa_s->confanother = os_rel2abs_path(iface->confanother);
- 		if (wpa_s->confanother &&
--		    !wpa_config_read(wpa_s->confanother, wpa_s->conf)) {
-+		    !wpa_config_read(wpa_s->confanother, wpa_s->conf, 1)) {
- 			wpa_printf(MSG_ERROR,
- 				   "Failed to read or parse configuration '%s'.",
- 				   wpa_s->confanother);
--- 
-2.29.2
-
diff --git a/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch b/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch
deleted file mode 100644
index 09e5b3673ac48..0000000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-The id and cred_id variables are reset to 0 every time the
-wpa_config_read function is called, which is fine as long as it is only
-called once. However, this is not the case when using both the -c and -I
-options to specify two config files.
-
-This is a problem because the GUI, since eadfeb0e93748eb396ae62012b92d21a7f533646,
-relies on the network IDs being unique (and increasing), and might get
-into an infinite loop otherwise.
-
-This is solved by simply making the variables static.
----
- wpa_supplicant/config_file.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
-index 6db5010db..c996e3916 100644
---- a/wpa_supplicant/config_file.c
-+++ b/wpa_supplicant/config_file.c
-@@ -297,8 +297,8 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)
- 	struct wpa_ssid *ssid, *tail, *head;
- 	struct wpa_cred *cred, *cred_tail, *cred_head;
- 	struct wpa_config *config;
--	int id = 0;
--	int cred_id = 0;
-+	static int id = 0;
-+	static int cred_id = 0;
-
- 	if (name == NULL)
- 		return NULL;
---
-2.34.1
-
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index e63bbd7a3fc0c..f163978b95122 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -3,28 +3,19 @@
 , dbusSupport ? !stdenv.hostPlatform.isStatic, dbus
 , withReadline ? true, readline
 , withPcsclite ? !stdenv.hostPlatform.isStatic, pcsclite
-, readOnlyModeSSIDs ? false
 }:
 
 with lib;
 stdenv.mkDerivation rec {
-  version = "2.10";
+  version = "2.11";
 
   pname = "wpa_supplicant";
 
   src = fetchurl {
     url = "https://w1.fi/releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-IN965RVLODA1X4q0JpEjqHr/3qWf50/pKSqR0Nfhey8=";
+    sha256 = "sha256-kS6gb3TjCo42+7aAZNbN/yGNjVkdsPxddd7myBrH/Ao=";
   };
 
-  patches = [
-    # Fix a bug when using two config files
-    ./Use-unique-IDs-for-networks-and-credentials.patch
-  ] ++ lib.optionals readOnlyModeSSIDs [
-    # Allow read-only networks
-    ./0001-Implement-read-only-mode-for-ssids.patch
-  ];
-
   # TODO: Patch epoll so that the dbus actually responds
   # TODO: Figure out how to get privsep working, currently getting SIGBUS
   extraConfig = ''
@@ -49,6 +40,7 @@ stdenv.mkDerivation rec {
     CONFIG_HT_OVERRIDES=y
     CONFIG_IEEE80211AC=y
     CONFIG_IEEE80211AX=y
+    CONFIG_IEEE80211BE=y
     CONFIG_IEEE80211N=y
     CONFIG_IEEE80211R=y
     CONFIG_IEEE80211W=y
diff --git a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix
index f428ef803b1a7..10169ff3fe4ee 100644
--- a/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix
+++ b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix
@@ -34,6 +34,6 @@ mkDerivation rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/os-specific/linux/xsensors/default.nix
index d229c22ee0c68..a67dcc9e716e1 100644
--- a/pkgs/os-specific/linux/xsensors/default.nix
+++ b/pkgs/os-specific/linux/xsensors/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index 96e02bd9f36c7..b17d839554f5b 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     description = "POSIX threads library for Windows";
     homepage = "https://sourceware.org/pthreads-win32";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.windows;
   };
 }
diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix
index f478c1e4c83a4..720dda3f61eb7 100644
--- a/pkgs/servers/alice-lg/default.nix
+++ b/pkgs/servers/alice-lg/default.nix
@@ -81,7 +81,7 @@ buildGoModule rec {
     description = "Looking-glass for BGP sessions";
     changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "alice-lg";
   };
 }
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index a8588663a8c1a..1760814771f91 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     description = "AMQP message broker and a C++ messaging API";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 70fc3e44e9cc7..79493f310dabb 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -91,6 +91,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 6c87e3c071157..44c44a0d2681b 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -45,6 +45,6 @@ lib.warnIf (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is d
     description = "Single sign-on and identity management tool";
     homepage = "https://www.atlassian.com/software/crowd";
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix
index daa8f55e87cb7..e30beee899ef1 100644
--- a/pkgs/servers/bazarr/default.nix
+++ b/pkgs/servers/bazarr/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, libarchive, ffmpeg, nixosTests }:
+{ stdenv, lib, fetchurl, makeWrapper, unzip, python3, unar, ffmpeg, nixosTests }:
 
 let
   runtimeProgDeps = [
     ffmpeg
-    libarchive
+    unar
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix
index 8c642db250557..b9ff3937e9737 100644
--- a/pkgs/servers/bindle/default.nix
+++ b/pkgs/servers/bindle/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Bindle: Aggregate Object Storage";
     homepage = "https://github.com/deislabs/bindle";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix
index 57840e526884d..744be3822484d 100644
--- a/pkgs/servers/birdwatcher/default.nix
+++ b/pkgs/servers/birdwatcher/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
     description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon";
     changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "birdwatcher";
   };
 }
diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index c1b03e1f667b2..129993903db4f 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "documize";
     homepage = "https://www.documize.com/";
   };
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index 0df4bc5a3833e..4271ed91ecd07 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/gnosek/fcgiwrap";
     description = "Simple server for running CGI applications over FastCGI";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
     license = licenses.mit;
     mainProgram = "fcgiwrap";
diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index 408b5289382a7..f947e6b9bd370 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -26,6 +26,6 @@ buildGoModule rec {
     description = "RPKI-to-Router server used at Cloudflare";
     homepage = "https://github.com/cloudflare/gortr/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 3e5495fae3108..704801e3c5244 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.7.3";
+  version = "2024.7.4";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -270,7 +270,8 @@
       pexpect
     ];
     "arve" = ps: with ps; [
-    ]; # missing inputs: asyncarve
+      asyncarve
+    ];
     "arwn" = ps: with ps; [
       paho-mqtt_1
     ];
@@ -366,7 +367,8 @@
       pybalboa
     ];
     "bang_olufsen" = ps: with ps; [
-    ]; # missing inputs: mozart-api
+      mozart-api
+    ];
     "bayesian" = ps: with ps; [
     ];
     "bbox" = ps: with ps; [
@@ -554,7 +556,8 @@
     "bswitch" = ps: with ps; [
     ];
     "bt_home_hub_5" = ps: with ps; [
-    ]; # missing inputs: bthomehub5-devicelist
+      bthomehub5-devicelist
+    ];
     "bt_smarthub" = ps: with ps; [
       btsmarthub-devicelist
     ];
@@ -626,7 +629,8 @@
       zeroconf
     ];
     "ccm15" = ps: with ps; [
-    ]; # missing inputs: py-ccm15
+      py-ccm15
+    ];
     "cert_expiry" = ps: with ps; [
     ];
     "channels" = ps: with ps; [
@@ -5281,6 +5285,7 @@
     "aquacell"
     "aranet"
     "arcam_fmj"
+    "arve"
     "aseko_pool_live"
     "assist_pipeline"
     "asterisk_mbox"
@@ -5300,6 +5305,7 @@
     "backup"
     "baf"
     "balboa"
+    "bang_olufsen"
     "bayesian"
     "binary_sensor"
     "blackbird"
@@ -5329,6 +5335,7 @@
     "camera"
     "canary"
     "cast"
+    "ccm15"
     "cert_expiry"
     "clicksend_tts"
     "climate"
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
index f98bc20a707ab..f10c7d6e5bdf1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
@@ -5,18 +5,18 @@
 
 buildNpmPackage rec {
   pname = "android-tv-card";
-  version = "3.9.0";
+  version = "3.9.2";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-/g86D00Z9iI2F3RWawKBhI/Si8hApSegCmyFni+Lqas=";
+    hash = "sha256-kqMHwUyQGfD8dL6VZPFCrQ91/h7j5KJVnAL0hHNk/qg=";
   };
 
   patches = [ ./dont-call-git.patch ];
 
-  npmDepsHash = "sha256-tdxpWUDVRW7YSXsGoS1s5xuvDZ/YaP6qWPImvgrgyAA=";
+  npmDepsHash = "sha256-zoEZibm0i3AgM3mGgwIIkqtsNkMXWErUfQ9Kaprs+Ag=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix
new file mode 100644
index 0000000000000..a9e8e5485c1c1
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  mkYarnPackage,
+  fetchYarnDeps,
+  fetchFromGitHub,
+}:
+
+mkYarnPackage rec {
+  pname = "atomic-calendar-revive";
+  version = "10.0.0";
+
+  src = fetchFromGitHub {
+    owner = "totaldebug";
+    repo = "atomic-calendar-revive";
+    rev = "v${version}";
+    hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU=";
+  };
+
+  packageJSON = ./package.json;
+
+  offlineCache = fetchYarnDeps {
+    name = "${pname}-yarn-offline-cache";
+    yarnLock = src + "/yarn.lock";
+    hash = "sha256-d3lk3mwgaWMPFl/EDUWH/tUlAC7OfhNycOLbi1GzkfM=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp ./deps/atomic-calendar-revive/dist/atomic-calendar-revive.js $out
+
+    runHook postInstall
+  '';
+
+  doDist = false;
+
+  passthru.updateScript = ./update.sh;
+
+  meta = with lib; {
+    changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${src.rev}";
+    description = "An advanced calendar card for Home Assistant Lovelace";
+    homepage = "https://github.com/totaldebug/atomic-calendar-revive";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json
new file mode 100644
index 0000000000000..c6c7707172b39
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json
@@ -0,0 +1,142 @@
+{
+	"name": "atomic-calendar-revive",
+	"version": "10.0.0",
+	"description": "Calendar Card for Home Assistant",
+	"main": "atomic-calendar-revive.js",
+	"scripts": {
+		"lint": "eslint src/*.ts | more ",
+		"lintindex": "eslint src/index.ts | more",
+		"lintindexfix": "eslint src/index.ts --fix",
+		"lintfixall": "eslint src/*.ts --fix",
+		"linteditor": "eslint src/index-editor.ts",
+		"babel": "babel dist/index.js --out-file dist/atomic-calendar-revive.js",
+		"rollup": "rollup -c",
+		"start": "rollup -c --watch --bundleConfigAsCjs",
+		"build": "rollup -c --bundleConfigAsCjs",
+		"watch": "rollup -c rollup-dev.config.mjs  --bundleConfigAsCjs",
+		"commit": "cz"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/totaldebug/atomic-calendar-revive.git"
+	},
+	"author": "Steven Marks",
+	"license": "ISC",
+	"devDependencies": {
+		"@babel/cli": "^7.24.7",
+		"@babel/core": "^7.24.7",
+		"@babel/plugin-proposal-class-properties": "^7.18.6",
+		"@babel/plugin-proposal-decorators": "^7.24.7",
+		"@babel/plugin-transform-template-literals": "^7.24.7",
+		"@babel/preset-env": "^7.24.7",
+		"@rollup/plugin-babel": "^6.0.4",
+		"@rollup/plugin-commonjs": "^26.0.1",
+		"@rollup/plugin-eslint": "^9.0.5",
+		"@rollup/plugin-json": "^6.1.0",
+		"@rollup/plugin-node-resolve": "^15.2.3",
+		"@rollup/plugin-terser": "^0.4.4",
+		"@semantic-release/changelog": "^6.0.3",
+		"@semantic-release/exec": "^6.0.3",
+		"@semantic-release/git": "^10.0.1",
+		"@typescript-eslint/eslint-plugin": "^7.13.1",
+		"@typescript-eslint/parser": "^7.13.1",
+		"babel-preset-minify": "^0.5.2",
+		"commitizen": "^4.3.0",
+		"conventional-changelog-conventionalcommits": "^8.0.0",
+		"cz-conventional-changelog": "^3.3.0",
+		"eslint": "^9.5.0",
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-import-resolver-typescript": "^3.6.1",
+		"eslint-plugin-import": "^2.29.1",
+		"eslint-plugin-prettier": "^5.1.3",
+		"prettier": "^3.3.2",
+		"rollup": "^4.18.0",
+		"rollup-plugin-serve": "^2.0.3",
+		"rollup-plugin-typescript2": "^0.36.0",
+		"semantic-release": "^24.0.0"
+	},
+	"dependencies": {
+		"@formatjs/icu-messageformat-parser": "^2.7.8",
+		"@lit-labs/scoped-registry-mixin": "^1.0.3",
+		"@lit/reactive-element": "2.0.4",
+		"@material/mwc-formfield": "^0.27.0",
+		"@material/mwc-icon-button": "^0.27.0",
+		"@material/mwc-linear-progress": "^0.27.0",
+		"@material/mwc-list": "^0.27.0",
+		"@material/mwc-menu": "^0.27.0",
+		"@material/mwc-notched-outline": "^0.27.0",
+		"@material/mwc-ripple": "^0.27.0",
+		"@material/mwc-select": "^0.27.0",
+		"@material/mwc-switch": "^0.27.0",
+		"@material/mwc-textfield": "^0.27.0",
+		"@mdi/js": "^7.4.47",
+		"@webcomponents/webcomponentsjs": "^2.8.0",
+		"dayjs": "^1.11.11",
+		"home-assistant-js-websocket": "^9.4.0",
+		"lit": "^3.1.4",
+		"memoize-one": "^6.0.0",
+		"npm": "^10.8.1",
+		"typescript": "^5.5.2"
+	},
+	"resolutions": {
+		"lit": "^3.0.2",
+		"@lit/reactive-element": "2.0.1"
+	},
+	"bugs": {
+		"url": "https://github.com/totaldebug/atomic-calendar-revive/issues"
+	},
+	"homepage": "https://github.com/totaldebug/atomic-calendar-revive#readme",
+	"config": {
+		"commitizen": {
+			"path": "./node_modules/cz-conventional-changelog"
+		}
+	},
+	"release": {
+		"plugins": [
+			[
+				"@semantic-release/commit-analyzer",
+				{
+					"preset": "conventionalcommits"
+				}
+			],
+			[
+				"@semantic-release/release-notes-generator",
+				{
+					"preset": "conventionalcommits"
+				}
+			],
+			[
+				"@semantic-release/npm",
+				{
+					"npmPublish": false
+				}
+			],
+			[
+				"@semantic-release/exec",
+				{
+					"prepareCmd": "yarn run build"
+				}
+			],
+			[
+				"@semantic-release/git",
+				{
+					"assets": [
+						"package.json"
+					],
+					"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+				}
+			],
+			[
+				"@semantic-release/github",
+				{
+					"assets": [
+						{
+							"path": "dist/atomic-calendar-revive.js"
+						}
+					]
+				}
+			],
+			"@semantic-release/changelog"
+		]
+	}
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh
new file mode 100755
index 0000000000000..62d943291b4f1
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update git
+# shellcheck shell=bash
+
+ROOT=$(git rev-parse --show-toplevel)
+ATTR=home-assistant-custom-lovelace-modules.atomic-calendar-revive
+
+cd "$ROOT" || exit 1
+
+# get current version in nixpkgs
+CURRENT_VERSION=$(nix eval -f ./default.nix --raw "$ATTR")
+
+# get latest release tag
+LATEST_RELEASE=$(curl https://api.github.com/repos/totaldebug/atomic-calendar-revive/releases | jq "[.[] | select(.prerelease == false)][0].tag_name")
+
+# strip version prefix
+LATEST_VERSION=${LATEST_RELEASE//"v"}
+
+# strip quotes
+LATEST_VERSION=${LATEST_VERSION%\"}
+LATEST_VERSION=${LATEST_VERSION#\"}
+
+if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ];
+then
+  echo Already on latest version
+  exit 0
+fi
+
+echo "Updating to ${LATEST_VERSION}"
+
+PKGDIR=$(dirname "$0")
+
+# change to package directory
+cd "$PKGDIR" || exit 1
+
+# update package.json
+echo "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json"
+curl -o ./package.json "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json"
+
+# update package
+cd "$ROOT" || exit 1
+nix-update --version "$LATEST_VERSION" "$ATTR"
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
index ad49333bbcc89..5af0caced5ef7 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
@@ -6,6 +6,8 @@
 
   apexcharts-card = callPackage ./apexcharts-card { };
 
+  atomic-calendar-revive = callPackage ./atomic-calendar-revive { };
+
   button-card = callPackage ./button-card { };
 
   card-mod = callPackage ./card-mod { };
@@ -24,6 +26,10 @@
 
   mushroom = callPackage ./mushroom { };
 
+  rmv-card = callPackage ./rmv-card { };
+
+  template-entity-row = callPackage ./template-entity-row { };
+
   valetudo-map-card = callPackage ./valetudo-map-card { };
 
   zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { };
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix
new file mode 100644
index 0000000000000..ec1fc6b201e0a
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+stdenv.mkDerivation {
+  pname = "rmv-card";
+  version = "0-unstable-2023-10-09";
+
+  src = fetchFromGitHub {
+    owner = "custom-cards";
+    repo = "rmv-card";
+    rev = "b0b2af1565bb69b8d304285cae163cb15883c9ab";
+    hash = "sha256-9chkS4wqkeNqeYGWdG00bwJOdDbsI+9VwWWfH+5TJoY=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp rmv-card.js $out/
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = with lib; {
+    description = "Custom card for the RMV component";
+    homepage = "https://github.com/custom-cards/rmv-card";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix
new file mode 100644
index 0000000000000..d4fbd31640ec5
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+  pname = "template-entity-row";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "thomasloven";
+    repo = "lovelace-template-entity-row";
+    rev = "v${version}";
+    hash = "sha256-XQxdnRQywWki5mJhmQU5Etz2XSB8jYC32tFGLWb3IXs=";
+  };
+
+  npmDepsHash = "sha256-fJ+2LWXtUH4PiHhoVhMMxdCnCjfH+xzk+vjI44rKF60=";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp template-entity-row.js $out/
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    changelog = "https://github.com/thomasloven/lovelace-template-entity-row/releases/tag/${src.rev}";
+    description = "Display whatever you want in an entities card row";
+    homepage = "https://github.com/thomasloven/lovelace-template-entity-row";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 876160c95265e..a57f0d32c4a62 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -468,7 +468,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2024.7.3";
+  hassVersion = "2024.7.4";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -486,13 +486,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-6f4z1mpoLOntImC161+0CyyuT3NrPdfuCa6/+wqzHgs=";
+    hash = "sha256-PHKFQmlwdS0+XpD5Pd+Xwv5KNB2kJKouh9jfBH3aUIU=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-YtrOUSQFTgDFL+iPm3itkKsMXs9IKyB2rCnpe7Bn2Gk=";
+    hash = "sha256-NJ5gD6k05ahIPCwktJgTz9zczxgnfuLesfjR58fbRL4=";
   };
 
   build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index b5c963f2c4347..de2f6c2852624 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2024.7.3";
+  version = "2024.7.4";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-4n1dnQX7Mo2vFCrSUUAvdO3ZErBKK6oUCITazI9PlIQ=";
+    hash = "sha256-xrYZTvHobr/53CdxKibQLEJ6wk4sdc1Ni/1icA9Sgc8=";
   };
 
   build-system = [
diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
index 7f574f9fd9629..fd310504f3cc7 100644
--- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     description = "Provide Zeroconf support via DNS-SD using Avahi";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix
index c0a9e11a6ce57..09089855d1cde 100644
--- a/pkgs/servers/http/apache-modules/mod_perl/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/apache/mod_perl/blob/trunk/Changes";
     license = licenses.asl20;
     mainProgram = "mp2bug";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix
index a859cf3dee4c8..ddd33184e046b 100644
--- a/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_python/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     description = "Apache module that embeds the Python interpreter within the server";
     mainProgram = "mod_python";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
index 078ae4d511498..c6668688931f8 100644
--- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix
+++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     inherit (mysql_jdbc.meta) description license platforms homepage;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 591e0852241e3..b167cb64da90b 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -54,7 +54,7 @@ let
       description = "Forward proxy module for CONNECT request handling";
       homepage = "https://github.com/chobits/ngx_http_proxy_connect_module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -77,7 +77,7 @@ let self = {
       description = "Validates Akamai v2 query string tokens";
       homepage = "https://github.com/kaltura/nginx-akamai-token-validate-module";
       license = with licenses; [ agpl3Only ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -109,7 +109,7 @@ let self = {
       description = "Integrate ARPA2 Resource ACLs into nginx";
       homepage = "https://gitlab.com/arpa2/nginx-auth-a2aclr";
       license = with licenses; [ isc ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -127,7 +127,7 @@ let self = {
       description = "Proxy to authenticated AWS services";
       homepage = "https://github.com/anomalizer/ngx_aws_auth";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -152,7 +152,7 @@ let self = {
       description = "Brotli compression";
       homepage = "https://github.com/google/ngx_brotli";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -170,7 +170,7 @@ let self = {
       description = "Adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches";
       homepage = "https://github.com/nginx-modules/ngx_cache_purge";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -188,7 +188,7 @@ let self = {
       description = "Collection of small and useful nginx add-ons";
       homepage = "https://github.com/FRiCKLE/ngx_coolkit";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -208,7 +208,7 @@ let self = {
       description = "WebDAV PROPFIND,OPTIONS,LOCK,UNLOCK support";
       homepage = "https://github.com/arut/nginx-dav-ext-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -226,7 +226,7 @@ let self = {
       description = "Adds additional generic tools that module developers can use in their own modules";
       homepage = "https://github.com/vision5/ngx_devel_kit";
       license = with licenses; [ bsd3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -246,7 +246,7 @@ let self = {
       description = "Brings echo, sleep, time, exec and more shell-style goodies to Nginx";
       homepage = "https://github.com/openresty/echo-nginx-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -282,7 +282,7 @@ let self = {
       description = "Fluentd data collector";
       homepage = "https://github.com/fluent/nginx-fluentd-module";
       license = with licenses; [ asl20 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -330,7 +330,7 @@ let self = {
       description = " IP address anonymizer";
       homepage = "https://github.com/masonicboom/ipscrub";
       license = with licenses; [ bsd3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -348,7 +348,7 @@ let self = {
       description = "Limit the total speed from the specific user";
       homepage = "https://github.com/yaoweibin/nginx_limit_speed_module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -366,7 +366,7 @@ let self = {
       description = "HTTP live module";
       homepage = "https://github.com/arut/nginx-live-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -402,7 +402,7 @@ let self = {
       description = "Embed the Power of Lua";
       homepage = "https://github.com/openresty/lua-nginx-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -423,7 +423,7 @@ let self = {
       description = "Expose Lua API to ngx_lua for Nginx upstreams";
       homepage = "https://github.com/openresty/lua-upstream-nginx-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -444,7 +444,7 @@ let self = {
       description = "Open source, cross platform web application firewall (WAF)";
       homepage = "https://github.com/SpiderLabs/ModSecurity";
       license = with licenses; [ asl20 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -480,7 +480,7 @@ let self = {
       description = "MPEG-TS Live Module";
       homepage = "https://github.com/arut/nginx-ts-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -498,7 +498,7 @@ let self = {
       description = "Open-source, high performance, low rules maintenance WAF";
       homepage = "https://github.com/nbs-system/naxsi";
       license = with licenses; [ gpl3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -528,7 +528,7 @@ let self = {
       description = "Subset of the JavaScript language that allows extending nginx functionality";
       homepage = "https://nginx.org/en/docs/njs/";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -550,7 +550,7 @@ let self = {
       description = "Enable requests served by nginx for distributed tracing via The OpenTracing Project";
       homepage = "https://github.com/opentracing-contrib/nginx-opentracing";
       license = with licenses; [ asl20 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -583,7 +583,7 @@ let self = {
       description = "Automatic PageSpeed optimization";
       homepage = "https://github.com/apache/incubator-pagespeed-ngx";
       license = with licenses; [ asl20 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -603,7 +603,7 @@ let self = {
       description = "Use PAM for simple http authentication";
       homepage = "https://github.com/sto/ngx_http_auth_pam_module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -621,7 +621,7 @@ let self = {
       description = "Pinba module for nginx";
       homepage = "https://github.com/tony2001/ngx_http_pinba_module";
       license = with licenses; [ unfree ]; # no license in repo
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -639,7 +639,7 @@ let self = {
       description = "Pure stream http push technology";
       homepage = "https://github.com/wandenberg/nginx-push-stream-module";
       license = with licenses; [ gpl3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -657,7 +657,7 @@ let self = {
       description = "Media Streaming Server";
       homepage = "https://github.com/arut/nginx-rtmp-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -678,7 +678,7 @@ let self = {
       description = "Generates CDN tokens, either as a cookie or as a query string parameter";
       homepage = "https://github.com/kaltura/nginx-secure-token-module";
       license = with licenses; [ agpl3Only ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -696,7 +696,7 @@ let self = {
       description = "Various set_xxx directives added to the rewrite module (md5/sha1, sql/json quoting and many more)";
       homepage = "https://github.com/openresty/set-misc-nginx-module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -714,7 +714,7 @@ let self = {
       description = "Shibboleth auth request";
       homepage = "https://github.com/nginx-shib/nginx-http-shibboleth";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -732,7 +732,7 @@ let self = {
       description = "Implements a collection of augmented statistics based on HTTP-codes and upstreams response time";
       homepage = "https://github.com/goldenclone/nginx-sla";
       license = with licenses; [ unfree ]; # no license in repo
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -750,7 +750,7 @@ let self = {
       description = "Adds ability to cache static files";
       homepage = "https://github.com/friCKLE/ngx_slowfs_cache";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -768,7 +768,7 @@ let self = {
       description = "Expose querystring parameters sorted in a variable";
       homepage = "https://github.com/wandenberg/nginx-sorted-querystring-module";
       license = with licenses; [ mit ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -806,7 +806,7 @@ let self = {
       description = "Send statistics to statsd";
       homepage = "https://github.com/harvesthq/nginx-statsd";
       license = with licenses; [ bsd3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -824,7 +824,7 @@ let self = {
       description = "Stream server traffic status core module";
       homepage = "https://github.com/vozlt/nginx-module-stream-sts";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -842,7 +842,7 @@ let self = {
       description = "Stream server traffic status module";
       homepage = "https://github.com/vozlt/nginx-module-sts";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -860,7 +860,7 @@ let self = {
       description = "Filter module which can do both regular expression and fixed string substitutions";
       homepage = "https://github.com/yaoweibin/ngx_http_substitutions_filter_module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -878,7 +878,7 @@ let self = {
       description = "Nginx sysguard module";
       homepage = "https://github.com/vozlt/nginx-module-sysguard";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -896,7 +896,7 @@ let self = {
       description = "Handle file uploads using multipart/form-data encoding and resumable uploads";
       homepage = "https://github.com/fdintino/nginx-upload-module";
       license = with licenses; [ bsd3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -914,7 +914,7 @@ let self = {
       description = "Support upstream health check";
       homepage = "https://github.com/yaoweibin/nginx_upstream_check_module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -934,7 +934,7 @@ let self = {
       description = "Tarantool NginX upstream module (REST, JSON API, websockets, load balancing)";
       homepage = "https://github.com/tarantool/nginx_upstream_module";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -952,7 +952,7 @@ let self = {
       description = "URL encoding converting module";
       homepage = "https://github.com/vozlt/nginx-module-url";
       license = with licenses; [ bsd2 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -973,7 +973,7 @@ let self = {
       description = "Extract thumbs from a video file";
       homepage = "https://github.com/wandenberg/nginx-video-thumbextractor-module";
       license = with licenses; [ gpl3 ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
@@ -997,7 +997,7 @@ let self = {
       description = "VOD packager";
       homepage = "https://github.com/kaltura/nginx-vod-module";
       license = with licenses; [ agpl3Only ];
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   };
 
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
index 3a4d9c8597c57..e8232f90b96a1 100644
--- a/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Provides an interface to external programs that support the FastCGI interface";
     mainProgram = "spawn-fcgi";
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index 7fae20bc1edbe..a3b6874ef1814 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "IRC client that runs as a daemon accepting notification requests";
     homepage = "https://gitlab.com/esr/irker";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "irkerd";
     platforms = platforms.unix;
   };
diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix
index d04d36e804897..1402764e81057 100644
--- a/pkgs/servers/mail/mailpit/source.nix
+++ b/pkgs/servers/mail/mailpit/source.nix
@@ -1,6 +1,6 @@
 {
-  version = "1.15.1";
-  hash = "sha256-5QEn4sEZgtoFrVonZsAtvzhEkxYGDEWwhJOxqwWQJTk=";
-  npmDepsHash = "sha256-5F68ia2V8mw4iPAjSoz0b8z1lplWtAg98BgDXYOmMKs=";
-  vendorHash = "sha256-e2mlOwGDU5NlKZSstHMdTidSfhNeeY6cBgtW+W9nwV8=";
+  version = "1.19.3";
+  hash = "sha256-LgKQOkkstmvbzkWtr53pNebZx2TSxJBArcchDCT7rMI=";
+  npmDepsHash = "sha256-cNLejqYjeR4GL9xXnCHe5HdONg8tYlpgJPAg3K9U+Xw=";
+  vendorHash = "sha256-kDNbYB1KzCUUn3EXt3CkfUXTIsg7VOLVtF7anzZOvYs=";
 }
diff --git a/pkgs/servers/mail/mailpit/update.sh b/pkgs/servers/mail/mailpit/update.sh
index 979cd11cda8a7..f54862d3fdc84 100755
--- a/pkgs/servers/mail/mailpit/update.sh
+++ b/pkgs/servers/mail/mailpit/update.sh
@@ -28,7 +28,7 @@ TMP="$(mktemp -d)"
 trap 'rm -rf "$TMP"' exit
 
 NIXPKGS_MAILPIT_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
-VERSIONS_NIX="$NIXPKGS_MAILPIT_PATH/versions.nix"
+SOURCE_NIX="$NIXPKGS_MAILPIT_PATH/source.nix"
 
 PREFETCH_JSON=$TMP/prefetch.json
 nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON"
@@ -38,7 +38,7 @@ NPM_DEPS_HASH="$(prefetch-npm-deps $PREFETCH_PATH/package-lock.json)"
 
 FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
-cat > $VERSIONS_NIX <<-EOF
+cat > $SOURCE_NIX <<-EOF
 {
   version = "$TARGET_VERSION";
   hash = "$PREFETCH_HASH";
@@ -50,7 +50,7 @@ EOF
 GO_HASH="$(nix-instantiate --eval -A mailpit.vendorHash | tr -d '"')"
 VENDOR_HASH=$(extractVendorHash "$GO_HASH")
 
-cat > $VERSIONS_NIX <<-EOF
+cat > $SOURCE_NIX <<-EOF
 {
   version = "$TARGET_VERSION";
   hash = "$PREFETCH_HASH";
@@ -68,6 +68,6 @@ cat <<-EOF
   "attrPath": "$UPDATE_NIX_ATTR_PATH",
   "oldVersion": "$UPDATE_NIX_OLD_VERSION",
   "newVersion": "$TARGET_VERSION",
-  "files": ["$VERSIONS_NIX"]
+  "files": ["$SOURCE_NIX"]
 }]
 EOF
diff --git a/pkgs/servers/matrix-synapse/plugins/pam.nix b/pkgs/servers/matrix-synapse/plugins/pam.nix
index 3f51631a75e34..a2f0324883c00 100644
--- a/pkgs/servers/matrix-synapse/plugins/pam.nix
+++ b/pkgs/servers/matrix-synapse/plugins/pam.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "PAM auth provider for the Synapse Matrix server";
     homepage = "https://github.com/14mRh4X0r/matrix-synapse-pam";
     license = licenses.eupl12;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
index 386849f17896c..08baf4a78576f 100644
--- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
+++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/matrix-org/synapse-s3-storage-provider";
     changelog = "https://github.com/matrix-org/synapse-s3-storage-provider/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 9a3b5b6357f7b..3aba439aff8b1 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -20,6 +20,6 @@ buildGoModule rec {
     mainProgram = "matterircd";
     homepage = "https://github.com/42wim/matterircd";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 7830d309b082d..2036d31e5b20f 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.mit;
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "meteor";
   };
 }
diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix
index 3a360ca0f89c0..61e878286ce2f 100644
--- a/pkgs/servers/monitoring/alerta/default.nix
+++ b/pkgs/servers/monitoring/alerta/default.nix
@@ -45,6 +45,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "Alerta Monitoring System server";
     mainProgram = "alertad";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/pkgs/servers/monitoring/matrix-alertmanager/default.nix
index 952da144b3aa3..13ddfc651c958 100644
--- a/pkgs/servers/monitoring/matrix-alertmanager/default.nix
+++ b/pkgs/servers/monitoring/matrix-alertmanager/default.nix
@@ -30,6 +30,6 @@ buildNpmPackage rec {
     mainProgram = "matrix-alertmanager";
     homepage = "https://github.com/jaywink/matrix-alertmanager";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
index 2690481b45f81..3f4bcb6646e25 100644
--- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
@@ -36,6 +36,6 @@ buildGoModule rec {
     homepage = "https://github.com/prometheus/influxdb_exporter";
     changelog = "https://github.com/prometheus/influxdb_exporter/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix
index 13ce969b826c4..775818ca15484 100644
--- a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix
@@ -19,6 +19,6 @@ buildGoModule rec {
     mainProgram = "jitsiexporter";
     homepage = "https://git.xsfx.dev/prometheus/jitsiexporter";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
index a5dba8e43725a..61a91bfd6de5b 100644
--- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
@@ -18,6 +18,6 @@ buildGoModule rec {
     mainProgram = "pihole-exporter";
     homepage = "https://github.com/eko/pihole-exporter";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index 6c012111c4d1d..f1d7f534c71e5 100644
--- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
@@ -25,6 +25,6 @@ buildGoModule rec {
     mainProgram = "rabbitmq_exporter";
     homepage = "https://github.com/kbudde/rabbitmq_exporter";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
index 0d5afa432a4e6..841837325d841 100644
--- a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
@@ -18,6 +18,6 @@ buildGoModule rec {
     mainProgram = "v2ray-exporter";
     homepage = "https://github.com/wi1dcard/v2ray-exporter";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix
index 6518e8694f4c5..12bfc319635ef 100644
--- a/pkgs/servers/neard/default.nix
+++ b/pkgs/servers/neard/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     description = "Near Field Communication manager";
     homepage = "https://01.org/linux-nfc";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     # error: wcwidth-0.2.13 not supported for interpreter python2.7
     broken = true; # Added 2024-03-17
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix
index fbc277f770adb..7ff8c19888575 100644
--- a/pkgs/servers/nosql/aerospike/default.nix
+++ b/pkgs/servers/nosql/aerospike/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "7.1.0.3";
+  version = "7.1.0.4";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-MBpN4rKweA47OpIkb009GYWEXy5TO/VRQWb32BUnDUQ=";
+    hash = "sha256-8fDwN2O2iz3AuMNuf3J9K2z69sE3JRYw19nWEKvqjTs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/servers/osmocom/libasn1c/default.nix
index c86475c69b85f..f83ff06fc9f65 100644
--- a/pkgs/servers/osmocom/libasn1c/default.nix
+++ b/pkgs/servers/osmocom/libasn1c/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/osmocom/libasn1c/";
     license = licenses.bsd2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix
index eab88ea99cb06..71b936f0d65a3 100644
--- a/pkgs/servers/osmocom/osmo-bsc/default.nix
+++ b/pkgs/servers/osmocom/osmo-bsc/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "GSM Base Station Controller";
     homepage = "https://projects.osmocom.org/projects/osmobsc";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-bsc";
   };
diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/servers/osmocom/osmo-bts/default.nix
index 1484c07f62e0f..632b57de70dac 100644
--- a/pkgs/servers/osmocom/osmo-bts/default.nix
+++ b/pkgs/servers/osmocom/osmo-bts/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom GSM Base Transceiver Station (BTS)";
     homepage = "https://osmocom.org/projects/osmobts";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix
index 3c1cac479bb21..1c034ddc60dae 100644
--- a/pkgs/servers/osmocom/osmo-ggsn/default.nix
+++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom Gateway GPRS Support Node (GGSN), successor of OpenGGSN";
     homepage = "https://osmocom.org/projects/openggsn";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-ggsn";
   };
diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix
index a8e017fabcb13..3b0a42ca418c7 100644
--- a/pkgs/servers/osmocom/osmo-hlr/default.nix
+++ b/pkgs/servers/osmocom/osmo-hlr/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom implementation of 3GPP Home Location Registr (HLR)";
     homepage = "https://osmocom.org/projects/osmo-hlr";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-hlr";
   };
diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/servers/osmocom/osmo-hnbgw/default.nix
index 7d9b8c54ff4b2..fc3798fde18d8 100644
--- a/pkgs/servers/osmocom/osmo-hnbgw/default.nix
+++ b/pkgs/servers/osmocom/osmo-hnbgw/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-hnbgw";
     homepage = "https://osmocom.org/projects/osmohnbgw";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/servers/osmocom/osmo-hnodeb/default.nix
index b187ddd4f55de..9455b14aad2a4 100644
--- a/pkgs/servers/osmocom/osmo-hnodeb/default.nix
+++ b/pkgs/servers/osmocom/osmo-hnodeb/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-hnodeb";
     homepage = "https://osmocom.org/projects/osmo-hnodeb";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix
index a5653a31c9442..98629719ee8dc 100644
--- a/pkgs/servers/osmocom/osmo-iuh/default.nix
+++ b/pkgs/servers/osmocom/osmo-iuh/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom IuH library";
     homepage = "https://osmocom.org/projects/osmohnbgw/wiki";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/servers/osmocom/osmo-mgw/default.nix
index 92986952378ee..e67e8e138f35e 100644
--- a/pkgs/servers/osmocom/osmo-mgw/default.nix
+++ b/pkgs/servers/osmocom/osmo-mgw/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-mgw";
     homepage = "https://osmocom.org/projects/osmo-mgw";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/servers/osmocom/osmo-msc/default.nix
index de73eb980bbf7..3b252aacbe236 100644
--- a/pkgs/servers/osmocom/osmo-msc/default.nix
+++ b/pkgs/servers/osmocom/osmo-msc/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-msc";
     homepage = "https://osmocom.org/projects/osmomsc/wiki";
     license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/servers/osmocom/osmo-pcu/default.nix
index 1d079d3a8c040..265ba665e2eaa 100644
--- a/pkgs/servers/osmocom/osmo-pcu/default.nix
+++ b/pkgs/servers/osmocom/osmo-pcu/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-pcu";
     homepage = "https://osmocom.org/projects/osmopcu";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix
index 0bcd2218a59cf..97d1027aba9ac 100644
--- a/pkgs/servers/osmocom/osmo-sgsn/default.nix
+++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Osmocom implementation of the 3GPP Serving GPRS Support Node (SGSN)";
     homepage = "https://osmocom.org/projects/osmosgsn";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "osmo-sgsn";
   };
diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/servers/osmocom/osmo-sip-connector/default.nix
index 77e4b8df3c5bf..16eeb782961b3 100644
--- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix
+++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     mainProgram = "osmo-sip-connector";
     homepage = "https://osmocom.org/projects/osmo-sip-conector";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix
index 750ac015c061e..6c9e31729855f 100644
--- a/pkgs/servers/pr-tracker/default.nix
+++ b/pkgs/servers/pr-tracker/default.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pr-tracker";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchzip {
     url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz";
-    hash = "sha256-pCT74nAbtULvyS2BQ+XQU3LzF/q05wLaEeSa9j3DoAo=";
+    hash = "sha256-ENgly8qmE3Xb6XhfjCdxcR0kQF5OTF9ACuCTnWvb+TQ=";
   };
 
-  cargoHash = "sha256-WFI7eyr7fdQ6ePXQ+n/VrtPQ2eMZpVR68nGRBBlq3JU=";
+  cargoHash = "sha256-F1OwPk8XL0Hyqe9latYrmJhXUIwK9xg/6pi4s1X/vXk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl systemd ];
diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix
index 307e762881a44..09b8828069c83 100644
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@@ -6,12 +6,12 @@
 , stdenv
 }:
 let
-  version = "24.1.10";
+  version = "24.1.13";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-HouhxCy0eQx4A4TF1id8XA7JEzDwzLfYre6MxufCeBM=";
+    sha256 = "sha256-7XDtQYuAVo3WvL59KHrROYlRH68/tAAU/7IGwtTS/+Q=";
   };
 in
 buildGoModule rec {
diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/servers/rinetd/default.nix
index 1cd7d19059d49..e9abb0ceab49e 100644
--- a/pkgs/servers/rinetd/default.nix
+++ b/pkgs/servers/rinetd/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/samhocevar/rinetd";
     changelog = "https://github.com/samhocevar/rinetd/blob/${src.rev}/CHANGES.md";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "rinetd";
   };
 }
diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix
index 72bffc0a2975d..90f773c73db15 100644
--- a/pkgs/servers/rpiplay/default.nix
+++ b/pkgs/servers/rpiplay/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/FD-/RPiPlay";
     description = "Open-source implementation of an AirPlay mirroring server";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "rpiplay";
   };
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 4f4f5e44ee609..0c11ffe8c1eea 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "Secure peer-to-peer VoIP server that uses the SIP protocol";
     homepage = "https://www.gnu.org/software/sipwitch/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     broken = true; # Require libexosip2 < 5.0.0 which is vulnerable to CVE-2014-10375.
   };
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index 6acb07c82a1af..afb46a2950891 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index 73d0adef93705..ff628ba2e3290 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
     description = "Distributed service for announcement and discovery of services";
     homepage = "https://github.com/skynetservices/skydns";
     license = lib.licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "skydns";
   };
 }
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 8ddb02aa0316a..1a92e75b93220 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "MySQL Connector/J";
     homepage = "https://dev.mysql.com/doc/connector-j/en/";
     changelog = "https://dev.mysql.com/doc/relnotes/connector-j/en/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     license = licenses.gpl2Only;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index b169b0240b0f3..f1762be17f2c7 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     changelog = "https://www.pgpool.net/docs/latest/en/html/release-${builtins.replaceStrings ["."] ["-"] version}.html";
     license = licenses.free;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index a758e9b98aff4..2c68d6dcbbad9 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     description = "Graph database extension for PostgreSQL";
     homepage = "https://age.apache.org/";
     changelog = "https://github.com/apache/age/raw/v${src.rev}/RELEASE";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = postgresql.meta.platforms;
     license = licenses.asl20;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
index 211216d86672c..28d6139f0a50d 100644
--- a/pkgs/servers/sql/postgresql/ext/citus.nix
+++ b/pkgs/servers/sql/postgresql/ext/citus.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.citusdata.com/";
     changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (postgresql.meta) platforms;
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
index 4a5786e03d9df..2b8edb366ffae 100644
--- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix
+++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system";
     homepage = "https://github.com/zachasme/h3-pg";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (postgresql.meta) platforms;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
index e858d6f0c5d0a..5306a619038d5 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "PostgreSQL extension implementing the HNSW algorithm for vector similarity search";
     homepage = "https://github.com/neondatabase/pg_embedding";
-    maintainers = with maintainers; [ ivan ];
+    maintainers = with maintainers; [ ];
     platforms = postgresql.meta.platforms;
     license = licenses.asl20;
   };
diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
index 615dcb3a80ae1..af1cee81fa788 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
@@ -135,7 +135,7 @@ in stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
     homepage = "https://plv8.github.io/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" "aarch64-linux" ];
     license = licenses.postgresql;
     broken = jitSupport;
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 3701ae6e8495f..cf75d52e7ac74 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
     homepage = "https://www.timescale.com/";
     changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = postgresql.meta.platforms;
     license = with licenses; if enableUnfree then tsl else asl20;
     broken = versionOlder postgresql.version "13";
diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/servers/unifiedpush-common-proxies/default.nix
index 34d787b84769b..0c0910893b9e5 100644
--- a/pkgs/servers/unifiedpush-common-proxies/default.nix
+++ b/pkgs/servers/unifiedpush-common-proxies/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
     description = "Set of rewrite proxies and gateways for UnifiedPush";
     homepage = "https://github.com/UnifiedPush/common-proxies";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "up_rewrite";
   };
 }
diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix
index 5d0b90265deb5..f83968936413f 100644
--- a/pkgs/servers/unpackerr/default.nix
+++ b/pkgs/servers/unpackerr/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import";
     homepage = "https://github.com/davidnewhall/unpackerr";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mit;
     mainProgram = "unpackerr";
   };
diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix
index 264c3243d2165..fd3de6d6958ff 100644
--- a/pkgs/servers/web-apps/engelsystem/default.nix
+++ b/pkgs/servers/web-apps/engelsystem/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     homepage = "https://engelsystem.de";
     license = licenses.gpl2Only;
     mainProgram = "migrate";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix
index 89175e5e5a674..a6740f7422902 100644
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@@ -77,7 +77,7 @@ gnustep.stdenv.mkDerivation rec {
     license = with licenses; [ gpl2Only lgpl21Only ];
     homepage = "https://sogo.nu/";
     platforms = platforms.linux;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
   };
 }
 
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 93b2869f8d2bb..dfa9dda457c91 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -177,7 +177,7 @@ in stdenv.mkDerivation {
 
   meta = with lib; {
     platforms   = platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license     = licenses.mit;
   };
 }
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 578e338dcb0ee..395fffe293fcb 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "bash";
   };
 }
diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix
index b3d4942620b79..dfbcc416572fa 100644
--- a/pkgs/shells/hishtory/default.nix
+++ b/pkgs/shells/hishtory/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
     description = "Your shell history: synced, queryable, and in context";
     homepage = "https://github.com/ddworken/hishtory";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "hishtory";
   };
 }
diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix
index 40c4edaff86e9..089a443a8237b 100644
--- a/pkgs/shells/zsh/fzf-zsh/default.nix
+++ b/pkgs/shells/zsh/fzf-zsh/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/wyntau/fzf-zsh";
     description = "wrap fzf to use in oh-my-zsh";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix
index fa40db3603b90..6112c2edfa1d6 100644
--- a/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/pkgs/shells/zsh/gradle-completion/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "Gradle tab completion for bash and zsh";
     homepage = "https://github.com/gradle/gradle-completion";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 1673b86c637f6..85bd6d5bf2e0a 100644
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix
index 9854d76ce2818..d85171530a6ae 100644
--- a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix
+++ b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation {
     homepage = "https://github.com/joshskidmore/zsh-fzf-history-search";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix
index 146014e2c974c..f2afd98de60a5 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/pkgs/shells/zsh/zsh-history/default.nix
@@ -31,7 +31,7 @@ buildGoModule rec {
     description = "CLI to provide enhanced history for your ZSH shell";
     homepage = "https://github.com/b4b4r07/history";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "history";
   };
 }
diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix
index f6d6c8ecb147e..222d958be1767 100644
--- a/pkgs/shells/zsh/zsh-you-should-use/default.nix
+++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/MichaelAquilina/zsh-you-should-use";
     license = licenses.gpl3;
     description = "ZSH plugin that reminds you to use existing aliases for commands you just typed";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 2a2259e840127..08768e0b9131f 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -21,7 +21,7 @@ let
   mkExtraBuildCommands0 = cc: ''
     rsrc="$out/resource-root"
     mkdir "$rsrc"
-    ln -s "${lib.getLib cc}/lib/clang/16/include" "$rsrc"
+    ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major cc.version}/include" "$rsrc"
     echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
   '';
   mkExtraBuildCommands =
@@ -87,7 +87,8 @@ let
           "bin/clang++"
           "bin/cpp"
         ];
-        version = "16";
+        # SYNCME: this version number must be synced with the one in make-bootstrap-tools.nix
+        version = "18";
       };
       libunwind = linkBootstrap {
         name = "libunwind";
diff --git a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
index d65c420fa1b71..fe133eb72a56f 100644
--- a/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
@@ -48,6 +48,8 @@
   '';
   bootstrap-tools = tar-all "bootstrap-tools.tar.xz" (
     with pkgs;
+    # SYNCME: this version number must be synced with the one in default.nix
+    let llvmPackages = llvmPackages_18; in
     [
       (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp")
       coreutils
diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix
index 41ddaefdfea8d..270e9a2e87616 100644
--- a/pkgs/test/cc-wrapper/hardening.nix
+++ b/pkgs/test/cc-wrapper/hardening.nix
@@ -3,6 +3,7 @@
 , runCommand
 , runCommandWith
 , runCommandCC
+, hello
 , debian-devscripts
 }:
 
@@ -18,6 +19,7 @@ let
       allowSubstitutes = false;
     } // env;
   } ''
+    [ -n "$postConfigure" ] && eval "$postConfigure"
     [ -n "$preBuild" ] && eval "$preBuild"
     n=$out/bin/test-bin
     mkdir -p "$(dirname "$n")"
@@ -29,10 +31,32 @@ let
   f2exampleWithStdEnv = writeCBinWithStdenv ./fortify2-example.c;
   f3exampleWithStdEnv = writeCBinWithStdenv ./fortify3-example.c;
 
+  # for when we need a slightly more complicated program
+  helloWithStdEnv = stdenv': env: (hello.override { stdenv = stdenv'; }).overrideAttrs ({
+    preBuild = ''
+      export CFLAGS="$TEST_EXTRA_FLAGS"
+    '';
+    NIX_DEBUG = "1";
+    postFixup = ''
+      cp $out/bin/hello $out/bin/test-bin
+    '';
+  } // env);
+
   stdenvUnsupport = additionalUnsupported: stdenv.override {
     cc = stdenv.cc.override {
-      cc = (lib.extendDerivation true {
-        hardeningUnsupportedFlags = (stdenv.cc.cc.hardeningUnsupportedFlags or []) ++ additionalUnsupported;
+      cc = (lib.extendDerivation true rec {
+        # this is ugly - have to cross-reference from
+        # hardeningUnsupportedFlagsByTargetPlatform to hardeningUnsupportedFlags
+        # because the finalAttrs mechanism that hardeningUnsupportedFlagsByTargetPlatform
+        # implementations use to do this won't work with lib.extendDerivation.
+        # but it's simplified by the fact that targetPlatform is already fixed
+        # at this point.
+        hardeningUnsupportedFlagsByTargetPlatform = _: hardeningUnsupportedFlags;
+        hardeningUnsupportedFlags = (
+          if stdenv.cc.cc ? hardeningUnsupportedFlagsByTargetPlatform
+          then stdenv.cc.cc.hardeningUnsupportedFlagsByTargetPlatform stdenv.targetPlatform
+          else (stdenv.cc.cc.hardeningUnsupportedFlags or [])
+        ) ++ additionalUnsupported;
       } stdenv.cc.cc);
     };
     allowedRequisites = null;
@@ -45,24 +69,39 @@ let
     ignorePie ? true,
     ignoreRelRO ? true,
     ignoreStackProtector ? true,
+    ignoreStackClashProtection ? true,
     expectFailure ? false,
   }: let
+    stackClashStr = "Stack clash protection: yes";
     expectFailureClause = lib.optionalString expectFailure
-      " && echo 'ERROR: Expected hardening-check to fail, but it passed!' >&2 && exit 1";
+      " && echo 'ERROR: Expected hardening-check to fail, but it passed!' >&2 && false";
   in runCommandCC "check-test-bin" {
     nativeBuildInputs = [ debian-devscripts ];
     buildInputs = [ testBin ];
-    meta.platforms = lib.platforms.linux;  # ELF-reliant
-  } ''
-    hardening-check --nocfprotection \
-      ${lib.optionalString ignoreBindNow "--nobindnow"} \
-      ${lib.optionalString ignoreFortify "--nofortify"} \
-      ${lib.optionalString ignorePie "--nopie"} \
-      ${lib.optionalString ignoreRelRO "--norelro"} \
-      ${lib.optionalString ignoreStackProtector "--nostackprotector"} \
-      $(PATH=$HOST_PATH type -P test-bin) ${expectFailureClause}
-    touch $out
-  '';
+    meta.platforms = if ignoreStackClashProtection
+      then lib.platforms.linux  # ELF-reliant
+      else [ "x86_64-linux" ];  # stackclashprotection test looks for x86-specific instructions
+  } (''
+    if ${lib.optionalString (!expectFailure) "!"} {
+      hardening-check --nocfprotection \
+        ${lib.optionalString ignoreBindNow "--nobindnow"} \
+        ${lib.optionalString ignoreFortify "--nofortify"} \
+        ${lib.optionalString ignorePie "--nopie"} \
+        ${lib.optionalString ignoreRelRO "--norelro"} \
+        ${lib.optionalString ignoreStackProtector "--nostackprotector"} \
+        $(PATH=$HOST_PATH type -P test-bin) | tee $out
+  '' + lib.optionalString (!ignoreStackClashProtection) ''
+      # stack clash protection doesn't actually affect the exit code of
+      # hardening-check (likely authors think false negatives too common)
+      { grep -F '${stackClashStr}' $out || { echo "Didn't find '${stackClashStr}' in output" && false ;} ;}
+  '' + ''
+    } ; then
+  '' + lib.optionalString expectFailure ''
+      echo 'ERROR: Expected hardening-check to fail, but it passed!' >&2
+  '' + ''
+      exit 2
+    fi
+  '');
 
   nameDrvAfterAttrName = builtins.mapAttrs (name: drv:
     drv.overrideAttrs (_: { name = "test-${name}"; })
@@ -151,6 +190,13 @@ in nameDrvAfterAttrName ({
     ignoreStackProtector = false;
   });
 
+  # protection patterns generated by clang not detectable?
+  stackClashProtectionExplicitEnabled = brokenIf stdenv.cc.isClang (checkTestBin (helloWithStdEnv stdenv {
+    hardeningEnable = [ "stackclashprotection" ];
+  }) {
+    ignoreStackClashProtection = false;
+  });
+
   bindNowExplicitDisabled = checkTestBin (f2exampleWithStdEnv stdenv {
     hardeningDisable = [ "bindnow" ];
   }) {
@@ -211,12 +257,19 @@ in nameDrvAfterAttrName ({
     expectFailure = true;
   };
 
+  stackClashProtectionExplicitDisabled = checkTestBin (helloWithStdEnv stdenv {
+    hardeningDisable = [ "stackclashprotection" ];
+  }) {
+    ignoreStackClashProtection = false;
+    expectFailure = true;
+  };
+
   # most flags can't be "unsupported" by compiler alone and
   # binutils doesn't have an accessible hardeningUnsupportedFlags
   # mechanism, so can only test a couple of flags through altered
   # stdenv trickery
 
-  fortifyStdenvUnsupp = checkTestBin (f2exampleWithStdEnv (stdenvUnsupport ["fortify"]) {
+  fortifyStdenvUnsupp = checkTestBin (f2exampleWithStdEnv (stdenvUnsupport ["fortify" "fortify3"]) {
     hardeningEnable = [ "fortify" ];
   }) {
     ignoreFortify = false;
@@ -237,13 +290,14 @@ in nameDrvAfterAttrName ({
     expectFailure = true;
   };
 
-  fortify3StdenvUnsuppDoesntUnsuppFortify = brokenIf stdenv.hostPlatform.isMusl (checkTestBin (f2exampleWithStdEnv (stdenvUnsupport ["fortify3"]) {
+  # musl implementation undetectable by this means even if present
+  fortify3StdenvUnsuppDoesntUnsuppFortify1 = brokenIf stdenv.hostPlatform.isMusl (checkTestBin (f1exampleWithStdEnv (stdenvUnsupport ["fortify3"]) {
     hardeningEnable = [ "fortify" ];
   }) {
     ignoreFortify = false;
   });
 
-  fortify3StdenvUnsuppDoesntUnsuppFortifyExecTest = fortifyExecTest (f2exampleWithStdEnv (stdenvUnsupport ["fortify3"]) {
+  fortify3StdenvUnsuppDoesntUnsuppFortify1ExecTest = fortifyExecTest (f1exampleWithStdEnv (stdenvUnsupport ["fortify3"]) {
     hardeningEnable = [ "fortify" ];
   });
 
@@ -254,12 +308,19 @@ in nameDrvAfterAttrName ({
     expectFailure = true;
   };
 
+  stackClashProtectionStdenvUnsupp = checkTestBin (helloWithStdEnv (stdenvUnsupport ["stackclashprotection"]) {
+    hardeningEnable = [ "stackclashprotection" ];
+  }) {
+    ignoreStackClashProtection = false;
+    expectFailure = true;
+  };
+
   # NIX_HARDENING_ENABLE set in the shell overrides hardeningDisable
   # and hardeningEnable
 
   stackProtectorReenabledEnv = checkTestBin (f2exampleWithStdEnv stdenv {
     hardeningDisable = [ "stackprotector" ];
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE="stackprotector"
     '';
   }) {
@@ -268,7 +329,7 @@ in nameDrvAfterAttrName ({
 
   stackProtectorReenabledFromAllEnv = checkTestBin (f2exampleWithStdEnv stdenv {
     hardeningDisable = [ "all" ];
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE="stackprotector"
     '';
   }) {
@@ -277,7 +338,7 @@ in nameDrvAfterAttrName ({
 
   stackProtectorRedisabledEnv = checkTestBin (f2exampleWithStdEnv stdenv {
     hardeningEnable = [ "stackprotector" ];
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE=""
     '';
   }) {
@@ -285,25 +346,26 @@ in nameDrvAfterAttrName ({
     expectFailure = true;
   };
 
-  fortify3EnabledEnvEnablesFortify = brokenIf stdenv.hostPlatform.isMusl (checkTestBin (f2exampleWithStdEnv stdenv {
+  # musl implementation undetectable by this means even if present
+  fortify3EnabledEnvEnablesFortify1 = brokenIf stdenv.hostPlatform.isMusl (checkTestBin (f1exampleWithStdEnv stdenv {
     hardeningDisable = [ "fortify" "fortify3" ];
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE="fortify3"
     '';
   }) {
     ignoreFortify = false;
   });
 
-  fortify3EnabledEnvEnablesFortifyExecTest = fortifyExecTest (f2exampleWithStdEnv stdenv {
+  fortify3EnabledEnvEnablesFortify1ExecTest = fortifyExecTest (f1exampleWithStdEnv stdenv {
     hardeningDisable = [ "fortify" "fortify3" ];
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE="fortify3"
     '';
   });
 
   fortifyEnabledEnvDoesntEnableFortify3 = checkTestBin (f3exampleWithStdEnv stdenv {
     hardeningDisable = [ "fortify" "fortify3" ];
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE="fortify"
     '';
   }) {
@@ -312,9 +374,8 @@ in nameDrvAfterAttrName ({
   };
 
   # NIX_HARDENING_ENABLE can't enable an unsupported feature
-
   stackProtectorUnsupportedEnabledEnv = checkTestBin (f2exampleWithStdEnv (stdenvUnsupport ["stackprotector"]) {
-    preBuild = ''
+    postConfigure = ''
       export NIX_HARDENING_ENABLE="stackprotector"
     '';
   }) {
@@ -322,23 +383,29 @@ in nameDrvAfterAttrName ({
     expectFailure = true;
   };
 
+  # current implementation prevents the command-line from disabling
+  # fortify if cc-wrapper is enabling it.
+
   # undetectable by this means on static even if present
   fortify1ExplicitEnabledCmdlineDisabled = brokenIf stdenv.hostPlatform.isStatic (checkTestBin (f1exampleWithStdEnv stdenv {
     hardeningEnable = [ "fortify" ];
-    preBuild = ''
+    postConfigure = ''
       export TEST_EXTRA_FLAGS='-D_FORTIFY_SOURCE=0'
     '';
   }) {
     ignoreFortify = false;
-    expectFailure = true;
+    expectFailure = false;
   });
 
+  # current implementation doesn't force-disable fortify if
+  # command-line enables it even if we use hardeningDisable.
+
   # musl implementation undetectable by this means even if present
   fortify1ExplicitDisabledCmdlineEnabled = brokenIf (
     stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isStatic
   ) (checkTestBin (f1exampleWithStdEnv stdenv {
     hardeningDisable = [ "fortify" ];
-    preBuild = ''
+    postConfigure = ''
       export TEST_EXTRA_FLAGS='-D_FORTIFY_SOURCE=1'
     '';
   }) {
@@ -347,14 +414,14 @@ in nameDrvAfterAttrName ({
 
   fortify1ExplicitDisabledCmdlineEnabledExecTest = fortifyExecTest (f1exampleWithStdEnv stdenv {
     hardeningDisable = [ "fortify" ];
-    preBuild = ''
+    postConfigure = ''
       export TEST_EXTRA_FLAGS='-D_FORTIFY_SOURCE=1'
     '';
   });
 
   fortify1ExplicitEnabledCmdlineDisabledNoWarn = f1exampleWithStdEnv stdenv {
     hardeningEnable = [ "fortify" ];
-    preBuild = ''
+    postConfigure = ''
       export TEST_EXTRA_FLAGS='-D_FORTIFY_SOURCE=0 -Werror'
     '';
   };
@@ -393,4 +460,9 @@ in {
     ignoreStackProtector = false;
     expectFailure = true;
   };
+
+  allExplicitDisabledStackClashProtection = checkTestBin tb {
+    ignoreStackClashProtection = false;
+    expectFailure = true;
+  };
 }))
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index 5e464d43f81cb..71c1c77fd9d3f 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
     homepage = "https://github.com/d4l3k/go-sct";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "sct";
   };
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix
index 3cfeb32272d56..a3afc4fa264a6 100644
--- a/pkgs/tools/X11/nx-libs/default.nix
+++ b/pkgs/tools/X11/nx-libs/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     description = "NX X server based on Xnest";
     homepage = "https://github.com/ArcticaProject/nx-libs";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index 1c212edafd921..80407564a2aa7 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
     description = "xautolock rewrite in Rust, with a few extra features";
     homepage = "https://github.com/jD91mZM2/xidlehook";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     badPlatforms = platforms.darwin;
     mainProgram = "xidlehook";
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix
index ec570892412c4..c3ef05b0a7745 100644
--- a/pkgs/tools/X11/xloadimage/default.nix
+++ b/pkgs/tools/X11/xloadimage/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
 
     license = lib.licenses.gpl2Plus;
 
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix
index f30c5651801d3..38a67622edb5e 100644
--- a/pkgs/tools/X11/xwallpaper/default.nix
+++ b/pkgs/tools/X11/xwallpaper/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/stoeckmann/xwallpaper";
     description = "Utility for setting wallpapers in X";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "xwallpaper";
   };
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix
index c423934babf24..fa93446fa4fa7 100644
--- a/pkgs/tools/admin/chkcrontab/default.nix
+++ b/pkgs/tools/admin/chkcrontab/default.nix
@@ -15,7 +15,7 @@ buildPythonApplication rec {
     description = "Tool to detect crontab errors";
     mainProgram = "chkcrontab";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     homepage = "https://github.com/lyda/chkcrontab";
   };
 }
diff --git a/pkgs/tools/admin/cjdns-tools/default.nix b/pkgs/tools/admin/cjdns-tools/default.nix
index 0d21409400176..dc76ce190760b 100644
--- a/pkgs/tools/admin/cjdns-tools/default.nix
+++ b/pkgs/tools/admin/cjdns-tools/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Tools for cjdns managment";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "cjdns-tools";
   };
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index df3bba816f0de..b53e3d6f8adad 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -44,6 +44,6 @@ buildGoModule rec {
     homepage = "https://github.com/quay/clair";
     changelog = "https://github.com/quay/clair/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix
index ff7a50676b469..f9e90afb272a4 100644
--- a/pkgs/tools/admin/docker-credential-helpers/default.nix
+++ b/pkgs/tools/admin/docker-credential-helpers/default.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     description = "Suite of programs to use native stores to keep Docker credentials safe";
     homepage = "https://github.com/docker/docker-credential-helpers";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   } // lib.optionalAttrs stdenv.isDarwin {
     mainProgram = "docker-credential-osxkeychain";
   };
diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json
index dd2cfb3917635..8e306436fee6f 100644
--- a/pkgs/tools/admin/google-cloud-sdk/components.json
+++ b/pkgs/tools/admin/google-cloud-sdk/components.json
@@ -5,7 +5,7 @@
         "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f",
         "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8",
         "size": 800,
-        "source": "components/google-cloud-sdk-alpha-20240628141907.tar.gz",
+        "source": "components/google-cloud-sdk-alpha-20240719191136.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -22,8 +22,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "2024.06.28"
+        "build_number": 20240719191136,
+        "version_string": "2024.07.19"
       }
     },
     {
@@ -72,7 +72,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
-        "display_name": "anthos-auth"
+        "display_name": "anthos-auth (Platform Specific)"
       },
       "id": "anthos-auth-darwin-arm",
       "is_configuration": false,
@@ -105,7 +105,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
-        "display_name": "anthos-auth"
+        "display_name": "anthos-auth (Platform Specific)"
       },
       "id": "anthos-auth-darwin-x86_64",
       "is_configuration": false,
@@ -138,7 +138,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
-        "display_name": "anthos-auth"
+        "display_name": "anthos-auth (Platform Specific)"
       },
       "id": "anthos-auth-linux-arm",
       "is_configuration": false,
@@ -171,7 +171,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
-        "display_name": "anthos-auth"
+        "display_name": "anthos-auth (Platform Specific)"
       },
       "id": "anthos-auth-linux-x86_64",
       "is_configuration": false,
@@ -204,7 +204,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
-        "display_name": "anthos-auth"
+        "display_name": "anthos-auth (Platform Specific)"
       },
       "id": "anthos-auth-windows-x86_64",
       "is_configuration": false,
@@ -258,15 +258,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.2.51"
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "e1541d0f19866acd7f02ba9b730cd8baa79927214f51586785d22bd6dd9d96d0",
-        "contents_checksum": "37b07e4ab5884c8fc3163cf3f868b04de6b8fa65391d3f677f4638ed67bc6989",
-        "size": 70641868,
-        "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240510142152.tar.gz",
+        "checksum": "b1dff49fd8a5270c26f1e86f53d802dd0f2a9523b22dd7a51d23739cc1702820",
+        "contents_checksum": "f8a87d4f50dd802ec2d3894b09db6ea3278bc609f3f6a280ca27d65a311b6ce3",
+        "size": 70632402,
+        "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -274,7 +274,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-darwin-arm",
       "is_configuration": false,
@@ -290,16 +290,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "a79426a22ede74645a49f4f6ea2ead54f4bbb978d297507f0a9cc827aca74d4a",
-        "contents_checksum": "9cc851b3b90a0148b2136d673ef3750a16337270ec8850f6ce5678975058a9d5",
-        "size": 74278294,
-        "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240510142152.tar.gz",
+        "checksum": "ebf7083c6bbb2d84bc09c6b715d21bb06420b216ff52e91062266e9dcede1f0c",
+        "contents_checksum": "1335273de68c0184e0a2215e8dff6f2a601dc745baee6b00df8b296ead9bbb45",
+        "size": 74268845,
+        "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -307,7 +307,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-darwin-x86",
       "is_configuration": false,
@@ -323,16 +323,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "e0f65a9d0bcc4051d1cba885e4693ba002d868e8adcbfe860489836754db371c",
-        "contents_checksum": "9cc851b3b90a0148b2136d673ef3750a16337270ec8850f6ce5678975058a9d5",
-        "size": 74278297,
-        "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240510142152.tar.gz",
+        "checksum": "95cd26d9e914a9005476c95f79da7eda04bf9c7756a2e68f1e78a66c16546e3b",
+        "contents_checksum": "1335273de68c0184e0a2215e8dff6f2a601dc745baee6b00df8b296ead9bbb45",
+        "size": 74268848,
+        "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -340,7 +340,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-darwin-x86_64",
       "is_configuration": false,
@@ -356,16 +356,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "a2a7bc2c5b398f38b611b9fb7f4cea1fdfc9a730c27812423fadf76302536ecd",
-        "contents_checksum": "5ebfe3a26d5efed23f391e280010b1162a11e75b9b8369ae3c82980bd0dec1dd",
-        "size": 67807780,
-        "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240510142152.tar.gz",
+        "checksum": "298acae5cd9f3f5f95ef15b43b92b604cb17efdf0f712f39aad805f28a17c36f",
+        "contents_checksum": "22fb27fa7110f719b143ef1e19fac7638567a6d7d48a909be7dd1a08badaa12f",
+        "size": 67808715,
+        "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -373,7 +373,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-linux-arm",
       "is_configuration": false,
@@ -389,16 +389,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "fc5bcbc677a7066d48686c2fc8962172f56f2795378b5b95b65342246a3e550a",
-        "contents_checksum": "0795a21686a22fc15bf78e6055ae1a64aa98f0309baec8ad3f6bad75aade8f60",
-        "size": 65502037,
-        "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240510142152.tar.gz",
+        "checksum": "1bb549e7745fbb6c422a66a69de83a4100548ef289415fbb80bf3424a27f0a5c",
+        "contents_checksum": "a5cf333202e0e3dacd64388c7604752c539f484159e83fff46026990b4b466b5",
+        "size": 65492449,
+        "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -406,7 +406,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-linux-x86",
       "is_configuration": false,
@@ -422,16 +422,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "812d5fbea1d143efc81bb692e0868532a97f9a670043498961345c6a3bc2ebb8",
-        "contents_checksum": "6f1752f2e2fd0f524b35f6087029c44a7a4d1dca7fdd40de9cf375603eea3b0f",
-        "size": 72538768,
-        "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240510142152.tar.gz",
+        "checksum": "69a107eef662d4ef0930a51bca72b585e4314f7f962cb54987cc072d87ff6891",
+        "contents_checksum": "878c7420eb7909d6c7073182f6ec1b96ea2adc6995d4a90e2e47634dd4c629d9",
+        "size": 72509283,
+        "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -439,7 +439,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-linux-x86_64",
       "is_configuration": false,
@@ -455,16 +455,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "45f187c48434cae0b00da5c210480e607bbf187f43a40b66683b47e19bbb373b",
-        "contents_checksum": "e160ef2c6526ad052dfa619298d44383c7f7502392a92b38929521a9ca858630",
-        "size": 67424078,
-        "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240510142152.tar.gz",
+        "checksum": "7e7147b4ec408e9cd8142bd0d6eac6b89b2bc545aa8421f67eaed7e8b8a1e9f2",
+        "contents_checksum": "c8a284c543bc838e22ac0b9762c6e1a559db867025305f38974f818ef0c44c2f",
+        "size": 67415658,
+        "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -472,7 +472,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-windows-x86",
       "is_configuration": false,
@@ -488,16 +488,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
       "data": {
-        "checksum": "cb5f588dffbb5d629588ea15e6fb44536a477c6bf55c5ae02a0a4ef65f1e433a",
-        "contents_checksum": "c5ce5039556b91366d6ed1e35aeb57b796f0b73c135ac29178ee615e43805209",
-        "size": 73168252,
-        "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240510142152.tar.gz",
+        "checksum": "f42e9bb1e16ea90787d639b08cd05a7e750b19cf9849d99aefe09d0808d2445c",
+        "contents_checksum": "031e4309260adf22c8cff1ad368c280186117c0906539b8180b642f9ffc0fa18",
+        "size": 73148423,
+        "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -505,7 +505,7 @@
       ],
       "details": {
         "description": "The cli for Anthos infrastructure.",
-        "display_name": "anthoscli"
+        "display_name": "anthoscli (Platform Specific)"
       },
       "id": "anthoscli-windows-x86_64",
       "is_configuration": false,
@@ -521,8 +521,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "0.2.51"
+        "build_number": 20240712142834,
+        "version_string": "0.2.52"
       }
     },
     {
@@ -578,7 +578,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-darwin-arm",
       "is_configuration": false,
@@ -613,7 +613,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-darwin-x86_64",
       "is_configuration": false,
@@ -648,7 +648,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-linux-arm",
       "is_configuration": false,
@@ -683,7 +683,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-linux-x86",
       "is_configuration": false,
@@ -718,7 +718,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-linux-x86_64",
       "is_configuration": false,
@@ -753,7 +753,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-windows-x86",
       "is_configuration": false,
@@ -788,7 +788,7 @@
       ],
       "details": {
         "description": "Provides the tools to develop Go applications on App Engine.",
-        "display_name": "App Engine Go Extensions"
+        "display_name": "App Engine Go Extensions (Platform Specific)"
       },
       "id": "app-engine-go-windows-x86_64",
       "is_configuration": false,
@@ -858,7 +858,7 @@
       ],
       "details": {
         "description": "Provides the gRPC Python library for App Engine.",
-        "display_name": "gRPC Python library"
+        "display_name": "gRPC Python library (Platform Specific)"
       },
       "id": "app-engine-grpc-darwin-x86_64",
       "is_configuration": false,
@@ -893,7 +893,7 @@
       ],
       "details": {
         "description": "Provides the gRPC Python library for App Engine.",
-        "display_name": "gRPC Python library"
+        "display_name": "gRPC Python library (Platform Specific)"
       },
       "id": "app-engine-grpc-linux-x86",
       "is_configuration": false,
@@ -928,7 +928,7 @@
       ],
       "details": {
         "description": "Provides the gRPC Python library for App Engine.",
-        "display_name": "gRPC Python library"
+        "display_name": "gRPC Python library (Platform Specific)"
       },
       "id": "app-engine-grpc-linux-x86_64",
       "is_configuration": false,
@@ -963,7 +963,7 @@
       ],
       "details": {
         "description": "Provides the gRPC Python library for App Engine.",
-        "display_name": "gRPC Python library"
+        "display_name": "gRPC Python library (Platform Specific)"
       },
       "id": "app-engine-grpc-windows-x86",
       "is_configuration": false,
@@ -998,7 +998,7 @@
       ],
       "details": {
         "description": "Provides the gRPC Python library for App Engine.",
-        "display_name": "gRPC Python library"
+        "display_name": "gRPC Python library (Platform Specific)"
       },
       "id": "app-engine-grpc-windows-x86_64",
       "is_configuration": false,
@@ -1020,10 +1020,10 @@
     },
     {
       "data": {
-        "checksum": "240d499b86cd1fcdd44475ea579b6af6ab258d9a69f7f3d64c3288e0311f02b2",
-        "contents_checksum": "d72e0f41dc3538983c78d6ee3c798f3f334da441a61205924ab2276748f70014",
-        "size": 133675565,
-        "source": "components/google-cloud-sdk-app-engine-java-20240607152945.tar.gz",
+        "checksum": "55d136d6b2f08b31a70183e5b80cd5b408d200aee316e87402b50eae2251c15d",
+        "contents_checksum": "ee286f0c07a3b33f0193a5ba439375f221c5d42190df5f5e17333d6b60ae3f1b",
+        "size": 134048645,
+        "source": "components/google-cloud-sdk-app-engine-java-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1041,103 +1041,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240607152945,
-        "version_string": "2.0.28"
-      }
-    },
-    {
-      "dependencies": [
-        "app-engine-php-darwin",
-        "app-engine-php-windows",
-        "app-engine-python",
-        "core"
-      ],
-      "details": {
-        "description": "Provides the PHP runtimes for the dev_appserver.",
-        "display_name": "gcloud app PHP Extensions"
-      },
-      "id": "app-engine-php",
-      "is_configuration": false,
-      "is_hidden": false,
-      "is_required": false,
-      "platform": {
-        "operating_systems": [
-          "CYGWIN",
-          "MACOSX",
-          "MSYS",
-          "WINDOWS"
-        ]
-      },
-      "platform_required": false,
-      "version": {
-        "build_number": 0,
-        "version_string": ""
-      }
-    },
-    {
-      "data": {
-        "checksum": "9d6d9d232739c8de9dcd7b35b7f8021136138e7892697229d3c04cb4a7aab494",
-        "contents_checksum": "5682195caf966a52c95bb865a3c2b607237ed97c36952b479ef358370401aaeb",
-        "size": 22985548,
-        "source": "components/google-cloud-sdk-app-engine-php-darwin-20170915105257.tar.gz",
-        "type": "tar"
-      },
-      "dependencies": [
-        "app-engine-php",
-        "app-engine-python",
-        "core"
-      ],
-      "details": {
-        "description": "Provides the PHP runtimes for the dev_appserver.",
-        "display_name": "gcloud app PHP Extensions"
-      },
-      "id": "app-engine-php-darwin",
-      "is_configuration": false,
-      "is_hidden": true,
-      "is_required": false,
-      "platform": {
-        "operating_systems": [
-          "MACOSX"
-        ]
-      },
-      "platform_required": false,
-      "version": {
-        "build_number": 20170915105257,
-        "version_string": "2017.09.15"
-      }
-    },
-    {
-      "data": {
-        "checksum": "c1f560a660d36d2bca873c01ca37a0790888713b2e056dfeeff3ea03f037235c",
-        "contents_checksum": "d11e66fd28ac784e4ef57b315bf626f01974db5cdbbc5e69f8e2689d4dc4de55",
-        "size": 20074666,
-        "source": "components/google-cloud-sdk-app-engine-php-windows-20170915105257.tar.gz",
-        "type": "tar"
-      },
-      "dependencies": [
-        "app-engine-php",
-        "app-engine-python",
-        "core"
-      ],
-      "details": {
-        "description": "Provides the PHP runtimes for the dev_appserver.",
-        "display_name": "gcloud app PHP Extensions"
-      },
-      "id": "app-engine-php-windows",
-      "is_configuration": false,
-      "is_hidden": true,
-      "is_required": false,
-      "platform": {
-        "operating_systems": [
-          "CYGWIN",
-          "MSYS",
-          "WINDOWS"
-        ]
-      },
-      "platform_required": false,
-      "version": {
-        "build_number": 20170915105257,
-        "version_string": "2017.09.15"
+        "build_number": 20240712142834,
+        "version_string": "2.0.29"
       }
     },
     {
@@ -1242,7 +1147,7 @@
       ],
       "details": {
         "description": "Provides appctl executable.",
-        "display_name": "Appctl"
+        "display_name": "Appctl (Platform Specific)"
       },
       "id": "appctl-darwin-x86",
       "is_configuration": false,
@@ -1275,7 +1180,7 @@
       ],
       "details": {
         "description": "Provides appctl executable.",
-        "display_name": "Appctl"
+        "display_name": "Appctl (Platform Specific)"
       },
       "id": "appctl-darwin-x86_64",
       "is_configuration": false,
@@ -1308,7 +1213,7 @@
       ],
       "details": {
         "description": "Provides appctl executable.",
-        "display_name": "Appctl"
+        "display_name": "Appctl (Platform Specific)"
       },
       "id": "appctl-linux-x86",
       "is_configuration": false,
@@ -1341,7 +1246,7 @@
       ],
       "details": {
         "description": "Provides appctl executable.",
-        "display_name": "Appctl"
+        "display_name": "Appctl (Platform Specific)"
       },
       "id": "appctl-linux-x86_64",
       "is_configuration": false,
@@ -1374,7 +1279,7 @@
       ],
       "details": {
         "description": "Provides appctl executable.",
-        "display_name": "Appctl"
+        "display_name": "Appctl (Platform Specific)"
       },
       "id": "appctl-windows-x86",
       "is_configuration": false,
@@ -1407,7 +1312,7 @@
       ],
       "details": {
         "description": "Provides appctl executable.",
-        "display_name": "Appctl"
+        "display_name": "Appctl (Platform Specific)"
       },
       "id": "appctl-windows-x86_64",
       "is_configuration": false,
@@ -1432,7 +1337,7 @@
         "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760",
         "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d",
         "size": 797,
-        "source": "components/google-cloud-sdk-beta-20240628141907.tar.gz",
+        "source": "components/google-cloud-sdk-beta-20240719191136.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1449,8 +1354,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "2024.06.28"
+        "build_number": 20240719191136,
+        "version_string": "2024.07.19"
       }
     },
     {
@@ -1505,7 +1410,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-darwin-arm",
       "is_configuration": false,
@@ -1539,7 +1444,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-darwin-x86",
       "is_configuration": false,
@@ -1573,7 +1478,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-darwin-x86_64",
       "is_configuration": false,
@@ -1607,7 +1512,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-linux-arm",
       "is_configuration": false,
@@ -1641,7 +1546,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-linux-x86",
       "is_configuration": false,
@@ -1675,7 +1580,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-linux-x86_64",
       "is_configuration": false,
@@ -1709,7 +1614,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-windows-x86",
       "is_configuration": false,
@@ -1743,7 +1648,7 @@
       ],
       "details": {
         "description": "Provides a tool for local Cloud Bigtable emulation.",
-        "display_name": "Cloud Bigtable Emulator"
+        "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
       "id": "bigtable-windows-x86_64",
       "is_configuration": false,
@@ -1765,10 +1670,10 @@
     },
     {
       "data": {
-        "checksum": "dc8a494e45b8fb7ed07610415670c4c24d790996c9704ea4de134f5ced656eed",
-        "contents_checksum": "fa75ed5c31aec233af4d26393b6ae73335c66906079df0040bf97716fd7f61a6",
-        "size": 1805684,
-        "source": "components/google-cloud-sdk-bq-20240628141907.tar.gz",
+        "checksum": "64bb21d9904b8d0a8659268dcd8ad837f242dfb9a68520aa1a4961e148ebf978",
+        "contents_checksum": "afc3a525e40185957652ca0fc81d466d989c3af243425644d2863734acc583e5",
+        "size": 1808321,
+        "source": "components/google-cloud-sdk-bq-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1787,8 +1692,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "2.1.6"
+        "build_number": 20240712142834,
+        "version_string": "2.1.7"
       }
     },
     {
@@ -1901,7 +1806,7 @@
       ],
       "details": {
         "description": "Provides stand-alone Python 2.7 install.",
-        "display_name": "Bundled Python 2.7"
+        "display_name": "Bundled Python 2.7 (Platform Specific)"
       },
       "id": "bundled-python-windows-x86",
       "is_configuration": false,
@@ -1936,7 +1841,7 @@
       ],
       "details": {
         "description": "Provides stand-alone Python 2.7 install.",
-        "display_name": "Bundled Python 2.7"
+        "display_name": "Bundled Python 2.7 (Platform Specific)"
       },
       "id": "bundled-python-windows-x86_64",
       "is_configuration": false,
@@ -2014,10 +1919,10 @@
     },
     {
       "data": {
-        "checksum": "400089c6607993c7b9e5f06616208e592a3a9892589e8c10167f70bfabdb5a2b",
-        "contents_checksum": "e147b6037ab53942f556f7914ce786005473f41d8b98c24b2d2ab9342e366b31",
-        "size": 78697278,
-        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240510142152.tar.gz",
+        "checksum": "fb1f862cee4cbc9231d9da6be07dc616b9d5f036c7484afced3e0792ed685915",
+        "contents_checksum": "39e7f47fac5b5738596d5b43c8dda500b684cfe85f14f0c7cd37f024e9b7da7c",
+        "size": 77646096,
+        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2026,7 +1931,7 @@
       ],
       "details": {
         "description": "Provides stand-alone Python 3.11.8 installation for UNIX.",
-        "display_name": "Bundled Python 3.11"
+        "display_name": "Bundled Python 3.11 (Platform Specific)"
       },
       "id": "bundled-python3-unix-linux-x86_64",
       "is_configuration": false,
@@ -2042,7 +1947,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
+        "build_number": 20240712142834,
         "version_string": "3.11.8"
       }
     },
@@ -2060,7 +1965,7 @@
       ],
       "details": {
         "description": "Provides stand-alone Python 3.11 install.",
-        "display_name": "Bundled Python 3.11"
+        "display_name": "Bundled Python 3.11 (Platform Specific)"
       },
       "id": "bundled-python3-windows-x86",
       "is_configuration": false,
@@ -2094,7 +1999,7 @@
       ],
       "details": {
         "description": "Provides stand-alone Python 3.11 install.",
-        "display_name": "Bundled Python 3.11"
+        "display_name": "Bundled Python 3.11 (Platform Specific)"
       },
       "id": "bundled-python3-windows-x86_64",
       "is_configuration": false,
@@ -2164,7 +2069,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-darwin-arm",
       "is_configuration": false,
@@ -2197,7 +2102,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-darwin-x86",
       "is_configuration": false,
@@ -2230,7 +2135,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-darwin-x86_64",
       "is_configuration": false,
@@ -2263,7 +2168,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-linux-arm",
       "is_configuration": false,
@@ -2296,7 +2201,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-linux-x86",
       "is_configuration": false,
@@ -2329,7 +2234,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-linux-x86_64",
       "is_configuration": false,
@@ -2362,7 +2267,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-windows-x86",
       "is_configuration": false,
@@ -2395,7 +2300,7 @@
       ],
       "details": {
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
-        "display_name": "Cloud Bigtable Command Line Tool"
+        "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
       "id": "cbt-windows-x86_64",
       "is_configuration": false,
@@ -2458,7 +2363,7 @@
       ],
       "details": {
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
-        "display_name": "Google Cloud Build Local Builder"
+        "display_name": "Google Cloud Build Local Builder (Platform Specific)"
       },
       "id": "cloud-build-local-darwin-x86_64",
       "is_configuration": false,
@@ -2491,7 +2396,7 @@
       ],
       "details": {
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
-        "display_name": "Google Cloud Build Local Builder"
+        "display_name": "Google Cloud Build Local Builder (Platform Specific)"
       },
       "id": "cloud-build-local-linux-x86",
       "is_configuration": false,
@@ -2524,7 +2429,7 @@
       ],
       "details": {
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
-        "display_name": "Google Cloud Build Local Builder"
+        "display_name": "Google Cloud Build Local Builder (Platform Specific)"
       },
       "id": "cloud-build-local-linux-x86_64",
       "is_configuration": false,
@@ -2642,7 +2547,7 @@
       ],
       "details": {
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
-        "display_name": "Cloud Run Proxy"
+        "display_name": "Cloud Run Proxy (Platform Specific)"
       },
       "id": "cloud-run-proxy-darwin-arm",
       "is_configuration": false,
@@ -2675,7 +2580,7 @@
       ],
       "details": {
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
-        "display_name": "Cloud Run Proxy"
+        "display_name": "Cloud Run Proxy (Platform Specific)"
       },
       "id": "cloud-run-proxy-darwin-x86_64",
       "is_configuration": false,
@@ -2708,7 +2613,7 @@
       ],
       "details": {
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
-        "display_name": "Cloud Run Proxy"
+        "display_name": "Cloud Run Proxy (Platform Specific)"
       },
       "id": "cloud-run-proxy-linux-arm",
       "is_configuration": false,
@@ -2741,7 +2646,7 @@
       ],
       "details": {
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
-        "display_name": "Cloud Run Proxy"
+        "display_name": "Cloud Run Proxy (Platform Specific)"
       },
       "id": "cloud-run-proxy-linux-x86_64",
       "is_configuration": false,
@@ -2774,7 +2679,7 @@
       ],
       "details": {
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
-        "display_name": "Cloud Run Proxy"
+        "display_name": "Cloud Run Proxy (Platform Specific)"
       },
       "id": "cloud-run-proxy-windows-x86_64",
       "is_configuration": false,
@@ -2835,7 +2740,7 @@
       ],
       "details": {
         "description": "Provides a local emulator of Cloud Spanner.",
-        "display_name": "Cloud Spanner Emulator"
+        "display_name": "Cloud Spanner Emulator (Platform Specific)"
       },
       "id": "cloud-spanner-emulator-linux-x86_64",
       "is_configuration": false,
@@ -2904,7 +2809,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-darwin-arm",
       "is_configuration": false,
@@ -2937,7 +2842,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-darwin-x86_64",
       "is_configuration": false,
@@ -2970,7 +2875,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-linux-arm",
       "is_configuration": false,
@@ -3003,7 +2908,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-linux-x86",
       "is_configuration": false,
@@ -3036,7 +2941,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-linux-x86_64",
       "is_configuration": false,
@@ -3069,7 +2974,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-windows-x86",
       "is_configuration": false,
@@ -3102,7 +3007,7 @@
       ],
       "details": {
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
-        "display_name": "Cloud SQL Proxy v2"
+        "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
       "id": "cloud-sql-proxy-windows-x86_64",
       "is_configuration": false,
@@ -3171,7 +3076,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-darwin-arm",
       "is_configuration": false,
@@ -3204,7 +3109,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-darwin-x86_64",
       "is_configuration": false,
@@ -3237,7 +3142,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-linux-arm",
       "is_configuration": false,
@@ -3270,7 +3175,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-linux-x86",
       "is_configuration": false,
@@ -3303,7 +3208,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-linux-x86_64",
       "is_configuration": false,
@@ -3336,7 +3241,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-windows-x86",
       "is_configuration": false,
@@ -3369,7 +3274,7 @@
       ],
       "details": {
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
-        "display_name": "Cloud SQL Proxy"
+        "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
       "id": "cloud_sql_proxy-windows-x86_64",
       "is_configuration": false,
@@ -3435,7 +3340,7 @@
       ],
       "details": {
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
-        "display_name": "config-connector"
+        "display_name": "config-connector (Platform Specific)"
       },
       "id": "config-connector-darwin-arm",
       "is_configuration": false,
@@ -3468,7 +3373,7 @@
       ],
       "details": {
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
-        "display_name": "config-connector"
+        "display_name": "config-connector (Platform Specific)"
       },
       "id": "config-connector-darwin-x86_64",
       "is_configuration": false,
@@ -3501,7 +3406,7 @@
       ],
       "details": {
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
-        "display_name": "config-connector"
+        "display_name": "config-connector (Platform Specific)"
       },
       "id": "config-connector-linux-arm",
       "is_configuration": false,
@@ -3534,7 +3439,7 @@
       ],
       "details": {
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
-        "display_name": "config-connector"
+        "display_name": "config-connector (Platform Specific)"
       },
       "id": "config-connector-linux-x86_64",
       "is_configuration": false,
@@ -3567,7 +3472,7 @@
       ],
       "details": {
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
-        "display_name": "config-connector"
+        "display_name": "config-connector (Platform Specific)"
       },
       "id": "config-connector-windows-x86_64",
       "is_configuration": false,
@@ -3589,10 +3494,10 @@
     },
     {
       "data": {
-        "checksum": "c85aa9d08f077efdaa4154c8b25b05bcc43652341172876778b6c1006c0eb227",
-        "contents_checksum": "f04fb4fc18ab33e87bfc87d5fcd7af2a1a4eeb98f5a17a5bd9f280a6728b4806",
-        "size": 19841449,
-        "source": "components/google-cloud-sdk-core-20240628141907.tar.gz",
+        "checksum": "ae3adb2a9e4ccfba6b0d55457ba91e349a8cbeec5d667556c1e4a21109420394",
+        "contents_checksum": "8e708148fcae335c224df37c7c45ff44278fa12bb0b9d42ef396c61962ee6309",
+        "size": 20088401,
+        "source": "components/google-cloud-sdk-core-20240719191136.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3613,8 +3518,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "2024.06.28"
+        "build_number": 20240719191136,
+        "version_string": "2024.07.19"
       }
     },
     {
@@ -3735,7 +3640,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-darwin-x86",
       "is_configuration": false,
@@ -3768,7 +3673,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-darwin-x86_64",
       "is_configuration": false,
@@ -3801,7 +3706,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-linux-arm",
       "is_configuration": false,
@@ -3834,7 +3739,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-linux-x86",
       "is_configuration": false,
@@ -3867,7 +3772,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-linux-x86_64",
       "is_configuration": false,
@@ -3900,7 +3805,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-windows-x86",
       "is_configuration": false,
@@ -3933,7 +3838,7 @@
       ],
       "details": {
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
-        "display_name": "Google Container Registry's Docker credential helper"
+        "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
       "id": "docker-credential-gcr-windows-x86_64",
       "is_configuration": false,
@@ -3998,7 +3903,7 @@
       ],
       "details": {
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
-        "display_name": "enterprise-certificate-proxy"
+        "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
       "id": "enterprise-certificate-proxy-darwin-arm",
       "is_configuration": false,
@@ -4031,7 +3936,7 @@
       ],
       "details": {
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
-        "display_name": "enterprise-certificate-proxy"
+        "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
       "id": "enterprise-certificate-proxy-darwin-x86_64",
       "is_configuration": false,
@@ -4064,7 +3969,7 @@
       ],
       "details": {
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
-        "display_name": "enterprise-certificate-proxy"
+        "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
       "id": "enterprise-certificate-proxy-linux-x86_64",
       "is_configuration": false,
@@ -4097,7 +4002,7 @@
       ],
       "details": {
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
-        "display_name": "enterprise-certificate-proxy"
+        "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
       "id": "enterprise-certificate-proxy-windows-x86_64",
       "is_configuration": false,
@@ -4174,10 +4079,10 @@
     },
     {
       "data": {
-        "checksum": "77cacb09f213e98cd3461796567bb583dc05e7f2fe70c47da65e948daf2dfff7",
-        "contents_checksum": "d651a36a3f0e41f7cc7312d09bc3c089a55a583cdaaaa922b0d385e57dece361",
-        "size": 1242963,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20231215195722.tar.gz",
+        "checksum": "01619f4c6a7bf2e3e01de81927ce7e5c0b5ee845418e0892758455736514034f",
+        "contents_checksum": "eddf662d79aa713f86069b1d5beb20419795514256037ebd643825fc60cf6950",
+        "size": 1295444,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4185,7 +4090,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-darwin-arm",
       "is_configuration": false,
@@ -4201,16 +4106,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "ef420a608c6446543cf660c7d168f6af297aebb760d163e11c3af278e34eb731",
-        "contents_checksum": "48cfe6b4f0f12b23a1271ef686966959314ba9d3ac21de9082009cbb5e9ab1d8",
-        "size": 1283814,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20231215195722.tar.gz",
+        "checksum": "8690ee8c426f0a839378d7b3431195dd3b9db25f7ebd618193b2d31221bae1b3",
+        "contents_checksum": "fe0d4da6db75b15d74b75ab1849699ceaec828d94586c016eb939480a3d4aa19",
+        "size": 1348172,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4218,7 +4123,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-darwin-x86_64",
       "is_configuration": false,
@@ -4234,16 +4139,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "c42492e21729fd33b413c7151e9b9d8c1b352a0f5fa94dbd42e39b0a417ea9da",
-        "contents_checksum": "06647040a666b59ce69c90e6ba9cbfba3f1763236a0872af722e62ea30e51e34",
-        "size": 1214415,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20231215195722.tar.gz",
+        "checksum": "45281a275510e694ec8d7038cdc12440bbf4e8ac99eaf4facadcb9f0970e1dd2",
+        "contents_checksum": "39aa19b5b52f148daeed6c023eae051a3d3a73204f36bb1291e0ed893c0a3a04",
+        "size": 1274880,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4251,7 +4156,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-linux-arm",
       "is_configuration": false,
@@ -4267,16 +4172,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "111269e6760bcf2c8d86c435ba6e1814b96281089d38dc73c699b9b12489c662",
-        "contents_checksum": "93fa6c57934e224e3e9e20eec8386ca1d3169b5a4e8f2515f1b042b11e000564",
-        "size": 1233668,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20231215195722.tar.gz",
+        "checksum": "80935422cdff13c6f146ce2ceef79df7184e6aedc1962325ec6349de1a40235d",
+        "contents_checksum": "3eb0e658ec47296ba5bd0dc47e639379f8e22cf26c287c855a03129efe81f625",
+        "size": 1277952,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4284,7 +4189,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-linux-x86",
       "is_configuration": false,
@@ -4300,16 +4205,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "3fe726e72437a2257264bedb9bb4d61949c15c80b9f587888717c267f65ab91e",
-        "contents_checksum": "0b6b618de4cf9fc339b414d44e6e834e6cdb5fae2ddb65bde3525ad78c595d51",
-        "size": 1287877,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20231215195722.tar.gz",
+        "checksum": "14d6d2178f84894c3518fe728bc6ec798efa629b6d2909357d2d917172f738c2",
+        "contents_checksum": "180f28ff98581f9c8a2b87b0323aeef1e387590d80ace7dc8c0628a9e6ad2c6d",
+        "size": 1350263,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4317,7 +4222,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-linux-x86_64",
       "is_configuration": false,
@@ -4333,16 +4238,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "46a658000be7850ef81652659448e70c67e089d20946a572c6ba521676af668c",
-        "contents_checksum": "58e78452a22e94789408f6afbb86a65544cb1fac500ef3fbe7422c5eb6b19c10",
-        "size": 1267116,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20231215195722.tar.gz",
+        "checksum": "dac408a36e4852744be49a4e35099b3edfb8a4e5c763b0c2804bb34eb33205d4",
+        "contents_checksum": "04b7b4c62d1890e519484ae22f53071c8109ed3555b288c03861e443490d6c3a",
+        "size": 1297402,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4350,7 +4255,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-windows-x86",
       "is_configuration": false,
@@ -4366,16 +4271,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "b9752b5c9eccc0105ef06f322b2dff92f2542884475708b864ae02e800ef7765",
-        "contents_checksum": "96506b713c645adb109e0a7bf83fef4af59a24cd7f714f8455b8d66af8946213",
-        "size": 1321071,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20231215195722.tar.gz",
+        "checksum": "39f75b70032b44cd5c6300b28457daa8a3530fa944dd0abf8319ebc6297dc173",
+        "contents_checksum": "2f6f233cedbee66aa646c0315d8382405d033671db00d38b247afcd64b97226c",
+        "size": 1376457,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4383,7 +4288,7 @@
       ],
       "details": {
         "description": "Command line tool that calculates CRC32C hashes on local files.",
-        "display_name": "Google Cloud CRC32C Hash Tool"
+        "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
       "id": "gcloud-crc32c-windows-x86_64",
       "is_configuration": false,
@@ -4399,16 +4304,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20231215195722,
+        "build_number": 20240712142834,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "ca09bfbd8ebc1571dc9770caddbb3c9e7ace51b30707eb50ff8de7e8a7c8049f",
-        "contents_checksum": "f3c947eafda42461652eb08104d0309bd3e5b2d1b6edacf276385313880a4da1",
-        "size": 17415961,
-        "source": "components/google-cloud-sdk-gcloud-deps-20240628141907.tar.gz",
+        "checksum": "c0c348262e6e0cf59e569551ea49f32397af64456c4b177cde10769837affdcb",
+        "contents_checksum": "cbe989aff03e61af3e43395fa240ddc702451d928eb10a2ccffa713b27180d12",
+        "size": 17417303,
+        "source": "components/google-cloud-sdk-gcloud-deps-20240712142834.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4431,8 +4336,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "2024.06.28"
+        "build_number": 20240712142834,
+        "version_string": "2024.07.12"
       }
     },
     {
@@ -4449,7 +4354,7 @@
       ],
       "details": {
         "description": "Set of third_party gcloud cli dependencies.",
-        "display_name": "gcloud cli dependencies"
+        "display_name": "gcloud cli dependencies (Platform Specific)"
       },
       "id": "gcloud-deps-darwin-x86",
       "is_configuration": false,
@@ -4483,7 +4388,7 @@
       ],
       "details": {
         "description": "Set of third_party gcloud cli dependencies.",
-        "display_name": "gcloud cli dependencies"
+        "display_name": "gcloud cli dependencies (Platform Specific)"
       },
       "id": "gcloud-deps-darwin-x86_64",
       "is_configuration": false,
@@ -4517,7 +4422,7 @@
       ],
       "details": {
         "description": "Set of third_party gcloud cli dependencies.",
-        "display_name": "gcloud cli dependencies"
+        "display_name": "gcloud cli dependencies (Platform Specific)"
       },
       "id": "gcloud-deps-linux-x86",
       "is_configuration": false,
@@ -4551,7 +4456,7 @@
       ],
       "details": {
         "description": "Set of third_party gcloud cli dependencies.",
-        "display_name": "gcloud cli dependencies"
+        "display_name": "gcloud cli dependencies (Platform Specific)"
       },
       "id": "gcloud-deps-linux-x86_64",
       "is_configuration": false,
@@ -4585,7 +4490,7 @@
       ],
       "details": {
         "description": "Set of third_party gcloud cli dependencies.",
-        "display_name": "gcloud cli dependencies"
+        "display_name": "gcloud cli dependencies (Platform Specific)"
       },
       "id": "gcloud-deps-windows-x86",
       "is_configuration": false,
@@ -4619,7 +4524,7 @@
       ],
       "details": {
         "description": "Set of third_party gcloud cli dependencies.",
-        "display_name": "gcloud cli dependencies"
+        "display_name": "gcloud cli dependencies (Platform Specific)"
       },
       "id": "gcloud-deps-windows-x86_64",
       "is_configuration": false,
@@ -4668,10 +4573,10 @@
     },
     {
       "data": {
-        "checksum": "6c9cdcacbe7cff43bd94a255b5388a67a3f042db77071893029d4cf1530110a7",
-        "contents_checksum": "5b5391973a55924bc0e962bc2d8654749d68e30144a38723eda2a5fb5883b5ac",
-        "size": 7056653,
-        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240628141907.tar.gz",
+        "checksum": "146b28c492f0d9d9b61dddf900e283d8574780c50b371454186be6059de9090c",
+        "contents_checksum": "0949914541210ca57cdf03cdc92a1d46421148628fc886fbaef65e5a2e16cd0c",
+        "size": 7076612,
+        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240719191136.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4696,7 +4601,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
+        "build_number": 20240719191136,
         "version_string": ""
       }
     },
@@ -4749,7 +4654,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-darwin-arm",
       "is_configuration": false,
@@ -4782,7 +4687,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-darwin-x86_64",
       "is_configuration": false,
@@ -4815,7 +4720,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-linux-arm",
       "is_configuration": false,
@@ -4848,7 +4753,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-linux-x86",
       "is_configuration": false,
@@ -4881,7 +4786,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-linux-x86_64",
       "is_configuration": false,
@@ -4914,7 +4819,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-windows-x86",
       "is_configuration": false,
@@ -4947,7 +4852,7 @@
       ],
       "details": {
         "description": "The auth plugin for Kubectl on GKE.",
-        "display_name": "gke-gcloud-auth-plugin"
+        "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
       "id": "gke-gcloud-auth-plugin-windows-x86_64",
       "is_configuration": false,
@@ -5099,7 +5004,7 @@
       ],
       "details": {
         "description": "Performs database migrations to Cloud Spanner databases.",
-        "display_name": "Cloud Spanner Migration Tool"
+        "display_name": "Cloud Spanner Migration Tool (Platform Specific)"
       },
       "id": "harbourbridge-linux-x86_64",
       "is_configuration": false,
@@ -5163,7 +5068,7 @@
       ],
       "details": {
         "description": "Support tool for Cloud Service Mesh.",
-        "display_name": "istioctl"
+        "display_name": "istioctl (Platform Specific)"
       },
       "id": "istioctl-darwin-arm",
       "is_configuration": false,
@@ -5196,7 +5101,7 @@
       ],
       "details": {
         "description": "Support tool for Cloud Service Mesh.",
-        "display_name": "istioctl"
+        "display_name": "istioctl (Platform Specific)"
       },
       "id": "istioctl-darwin-x86_64",
       "is_configuration": false,
@@ -5229,7 +5134,7 @@
       ],
       "details": {
         "description": "Support tool for Cloud Service Mesh.",
-        "display_name": "istioctl"
+        "display_name": "istioctl (Platform Specific)"
       },
       "id": "istioctl-linux-arm",
       "is_configuration": false,
@@ -5262,7 +5167,7 @@
       ],
       "details": {
         "description": "Support tool for Cloud Service Mesh.",
-        "display_name": "istioctl"
+        "display_name": "istioctl (Platform Specific)"
       },
       "id": "istioctl-linux-x86_64",
       "is_configuration": false,
@@ -5326,7 +5231,7 @@
       ],
       "details": {
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
-        "display_name": "kpt"
+        "display_name": "kpt (Platform Specific)"
       },
       "id": "kpt-darwin-arm",
       "is_configuration": false,
@@ -5359,7 +5264,7 @@
       ],
       "details": {
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
-        "display_name": "kpt"
+        "display_name": "kpt (Platform Specific)"
       },
       "id": "kpt-darwin-x86_64",
       "is_configuration": false,
@@ -5392,7 +5297,7 @@
       ],
       "details": {
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
-        "display_name": "kpt"
+        "display_name": "kpt (Platform Specific)"
       },
       "id": "kpt-linux-arm",
       "is_configuration": false,
@@ -5425,7 +5330,7 @@
       ],
       "details": {
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
-        "display_name": "kpt"
+        "display_name": "kpt (Platform Specific)"
       },
       "id": "kpt-linux-x86_64",
       "is_configuration": false,
@@ -5492,7 +5397,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-darwin-arm",
       "is_configuration": false,
@@ -5526,7 +5431,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-darwin-x86_64",
       "is_configuration": false,
@@ -5560,7 +5465,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-linux-arm",
       "is_configuration": false,
@@ -5594,7 +5499,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-linux-x86",
       "is_configuration": false,
@@ -5628,7 +5533,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-linux-x86_64",
       "is_configuration": false,
@@ -5694,7 +5599,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
-        "display_name": "kubectl-oidc"
+        "display_name": "kubectl-oidc (Platform Specific)"
       },
       "id": "kubectl-oidc-darwin-arm",
       "is_configuration": false,
@@ -5727,7 +5632,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
-        "display_name": "kubectl-oidc"
+        "display_name": "kubectl-oidc (Platform Specific)"
       },
       "id": "kubectl-oidc-darwin-x86_64",
       "is_configuration": false,
@@ -5760,7 +5665,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
-        "display_name": "kubectl-oidc"
+        "display_name": "kubectl-oidc (Platform Specific)"
       },
       "id": "kubectl-oidc-linux-arm",
       "is_configuration": false,
@@ -5793,7 +5698,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
-        "display_name": "kubectl-oidc"
+        "display_name": "kubectl-oidc (Platform Specific)"
       },
       "id": "kubectl-oidc-linux-x86_64",
       "is_configuration": false,
@@ -5826,7 +5731,7 @@
       ],
       "details": {
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
-        "display_name": "kubectl-oidc"
+        "display_name": "kubectl-oidc (Platform Specific)"
       },
       "id": "kubectl-oidc-windows-x86_64",
       "is_configuration": false,
@@ -5860,7 +5765,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-windows-x86",
       "is_configuration": false,
@@ -5896,7 +5801,7 @@
       ],
       "details": {
         "description": "Provides kubectl executables.",
-        "display_name": "kubectl"
+        "display_name": "kubectl (Platform Specific)"
       },
       "id": "kubectl-windows-x86_64",
       "is_configuration": false,
@@ -5962,7 +5867,7 @@
       ],
       "details": {
         "description": "Provides kustomize executable.",
-        "display_name": "Kustomize"
+        "display_name": "Kustomize (Platform Specific)"
       },
       "id": "kustomize-darwin-arm",
       "is_configuration": false,
@@ -5995,7 +5900,7 @@
       ],
       "details": {
         "description": "Provides kustomize executable.",
-        "display_name": "Kustomize"
+        "display_name": "Kustomize (Platform Specific)"
       },
       "id": "kustomize-darwin-x86_64",
       "is_configuration": false,
@@ -6028,7 +5933,7 @@
       ],
       "details": {
         "description": "Provides kustomize executable.",
-        "display_name": "Kustomize"
+        "display_name": "Kustomize (Platform Specific)"
       },
       "id": "kustomize-linux-arm",
       "is_configuration": false,
@@ -6061,7 +5966,7 @@
       ],
       "details": {
         "description": "Provides kustomize executable.",
-        "display_name": "Kustomize"
+        "display_name": "Kustomize (Platform Specific)"
       },
       "id": "kustomize-linux-x86_64",
       "is_configuration": false,
@@ -6125,7 +6030,7 @@
       ],
       "details": {
         "description": "Locally extract packages/versions from a container image.",
-        "display_name": "On-Demand Scanning API extraction helper"
+        "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
       "id": "local-extract-darwin-arm",
       "is_configuration": false,
@@ -6158,7 +6063,7 @@
       ],
       "details": {
         "description": "Locally extract packages/versions from a container image.",
-        "display_name": "On-Demand Scanning API extraction helper"
+        "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
       "id": "local-extract-darwin-x86_64",
       "is_configuration": false,
@@ -6191,7 +6096,7 @@
       ],
       "details": {
         "description": "Locally extract packages/versions from a container image.",
-        "display_name": "On-Demand Scanning API extraction helper"
+        "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
       "id": "local-extract-linux-arm",
       "is_configuration": false,
@@ -6224,7 +6129,7 @@
       ],
       "details": {
         "description": "Locally extract packages/versions from a container image.",
-        "display_name": "On-Demand Scanning API extraction helper"
+        "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
       "id": "local-extract-linux-x86_64",
       "is_configuration": false,
@@ -6290,7 +6195,7 @@
       ],
       "details": {
         "description": "Provides log streaming services.",
-        "display_name": "Log Streaming"
+        "display_name": "Log Streaming (Platform Specific)"
       },
       "id": "log-streaming-darwin-arm",
       "is_configuration": false,
@@ -6323,7 +6228,7 @@
       ],
       "details": {
         "description": "Provides log streaming services.",
-        "display_name": "Log Streaming"
+        "display_name": "Log Streaming (Platform Specific)"
       },
       "id": "log-streaming-darwin-x86_64",
       "is_configuration": false,
@@ -6356,7 +6261,7 @@
       ],
       "details": {
         "description": "Provides log streaming services.",
-        "display_name": "Log Streaming"
+        "display_name": "Log Streaming (Platform Specific)"
       },
       "id": "log-streaming-linux-arm",
       "is_configuration": false,
@@ -6389,7 +6294,7 @@
       ],
       "details": {
         "description": "Provides log streaming services.",
-        "display_name": "Log Streaming"
+        "display_name": "Log Streaming (Platform Specific)"
       },
       "id": "log-streaming-linux-x86_64",
       "is_configuration": false,
@@ -6422,7 +6327,7 @@
       ],
       "details": {
         "description": "Provides log streaming services.",
-        "display_name": "Log Streaming"
+        "display_name": "Log Streaming (Platform Specific)"
       },
       "id": "log-streaming-windows-x86_64",
       "is_configuration": false,
@@ -6488,7 +6393,7 @@
       ],
       "details": {
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
-        "display_name": "Minikube"
+        "display_name": "Minikube (Platform Specific)"
       },
       "id": "minikube-darwin-arm",
       "is_configuration": false,
@@ -6521,7 +6426,7 @@
       ],
       "details": {
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
-        "display_name": "Minikube"
+        "display_name": "Minikube (Platform Specific)"
       },
       "id": "minikube-darwin-x86_64",
       "is_configuration": false,
@@ -6554,7 +6459,7 @@
       ],
       "details": {
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
-        "display_name": "Minikube"
+        "display_name": "Minikube (Platform Specific)"
       },
       "id": "minikube-linux-arm",
       "is_configuration": false,
@@ -6587,7 +6492,7 @@
       ],
       "details": {
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
-        "display_name": "Minikube"
+        "display_name": "Minikube (Platform Specific)"
       },
       "id": "minikube-linux-x86_64",
       "is_configuration": false,
@@ -6620,7 +6525,7 @@
       ],
       "details": {
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
-        "display_name": "Minikube"
+        "display_name": "Minikube (Platform Specific)"
       },
       "id": "minikube-windows-x86_64",
       "is_configuration": false,
@@ -6681,7 +6586,7 @@
       ],
       "details": {
         "description": "Provides nomos executable.",
-        "display_name": "Nomos CLI"
+        "display_name": "Nomos CLI (Platform Specific)"
       },
       "id": "nomos-darwin-x86_64",
       "is_configuration": false,
@@ -6714,7 +6619,7 @@
       ],
       "details": {
         "description": "Provides nomos executable.",
-        "display_name": "Nomos CLI"
+        "display_name": "Nomos CLI (Platform Specific)"
       },
       "id": "nomos-linux-x86_64",
       "is_configuration": false,
@@ -6780,7 +6685,7 @@
       ],
       "details": {
         "description": "Package a Go module zip file from Go source code.",
-        "display_name": "Artifact Registry Go Module Package Helper"
+        "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
       "id": "package-go-module-darwin-arm",
       "is_configuration": false,
@@ -6813,7 +6718,7 @@
       ],
       "details": {
         "description": "Package a Go module zip file from Go source code.",
-        "display_name": "Artifact Registry Go Module Package Helper"
+        "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
       "id": "package-go-module-darwin-x86_64",
       "is_configuration": false,
@@ -6846,7 +6751,7 @@
       ],
       "details": {
         "description": "Package a Go module zip file from Go source code.",
-        "display_name": "Artifact Registry Go Module Package Helper"
+        "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
       "id": "package-go-module-linux-arm",
       "is_configuration": false,
@@ -6879,7 +6784,7 @@
       ],
       "details": {
         "description": "Package a Go module zip file from Go source code.",
-        "display_name": "Artifact Registry Go Module Package Helper"
+        "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
       "id": "package-go-module-linux-x86_64",
       "is_configuration": false,
@@ -6912,7 +6817,7 @@
       ],
       "details": {
         "description": "Package a Go module zip file from Go source code.",
-        "display_name": "Artifact Registry Go Module Package Helper"
+        "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
       "id": "package-go-module-windows-x86_64",
       "is_configuration": false,
@@ -6992,7 +6897,7 @@
       ],
       "details": {
         "description": "PowerShell cmdlets for the Google Cloud Platform.",
-        "display_name": "Cloud Tools for PowerShell"
+        "display_name": "Cloud Tools for PowerShell (Platform Specific)"
       },
       "id": "powershell-windows",
       "is_configuration": false,
@@ -7083,7 +6988,7 @@
       ],
       "details": {
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
-        "display_name": "Skaffold"
+        "display_name": "Skaffold (Platform Specific)"
       },
       "id": "skaffold-darwin-arm",
       "is_configuration": false,
@@ -7117,7 +7022,7 @@
       ],
       "details": {
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
-        "display_name": "Skaffold"
+        "display_name": "Skaffold (Platform Specific)"
       },
       "id": "skaffold-darwin-x86_64",
       "is_configuration": false,
@@ -7151,7 +7056,7 @@
       ],
       "details": {
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
-        "display_name": "Skaffold"
+        "display_name": "Skaffold (Platform Specific)"
       },
       "id": "skaffold-linux-arm",
       "is_configuration": false,
@@ -7185,7 +7090,7 @@
       ],
       "details": {
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
-        "display_name": "Skaffold"
+        "display_name": "Skaffold (Platform Specific)"
       },
       "id": "skaffold-linux-x86_64",
       "is_configuration": false,
@@ -7219,7 +7124,7 @@
       ],
       "details": {
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
-        "display_name": "Skaffold"
+        "display_name": "Skaffold (Platform Specific)"
       },
       "id": "skaffold-windows-x86_64",
       "is_configuration": false,
@@ -7278,7 +7183,7 @@
       ],
       "details": {
         "description": "Performs database migrations to Cloud Spanner databases.",
-        "display_name": "Spanner migration tool"
+        "display_name": "Spanner migration tool (Platform Specific)"
       },
       "id": "spanner-migration-tool-linux-x86_64",
       "is_configuration": false,
@@ -7334,7 +7239,7 @@
       ],
       "details": {
         "description": "Provides Windows command line ssh tools.",
-        "display_name": "Windows command line ssh tools"
+        "display_name": "Windows command line ssh tools (Platform Specific)"
       },
       "id": "ssh-tools-windows",
       "is_configuration": false,
@@ -7397,7 +7302,7 @@
       ],
       "details": {
         "description": "Tools for working with Terraform data",
-        "display_name": "Terraform Tools"
+        "display_name": "Terraform Tools (Platform Specific)"
       },
       "id": "terraform-tools-darwin-arm",
       "is_configuration": false,
@@ -7430,7 +7335,7 @@
       ],
       "details": {
         "description": "Tools for working with Terraform data",
-        "display_name": "Terraform Tools"
+        "display_name": "Terraform Tools (Platform Specific)"
       },
       "id": "terraform-tools-darwin-x86_64",
       "is_configuration": false,
@@ -7463,7 +7368,7 @@
       ],
       "details": {
         "description": "Tools for working with Terraform data",
-        "display_name": "Terraform Tools"
+        "display_name": "Terraform Tools (Platform Specific)"
       },
       "id": "terraform-tools-linux-arm",
       "is_configuration": false,
@@ -7496,7 +7401,7 @@
       ],
       "details": {
         "description": "Tools for working with Terraform data",
-        "display_name": "Terraform Tools"
+        "display_name": "Terraform Tools (Platform Specific)"
       },
       "id": "terraform-tools-linux-x86_64",
       "is_configuration": false,
@@ -7529,7 +7434,7 @@
       ],
       "details": {
         "description": "Tools for working with Terraform data",
-        "display_name": "Terraform Tools"
+        "display_name": "Terraform Tools (Platform Specific)"
       },
       "id": "terraform-tools-windows-x86_64",
       "is_configuration": false,
@@ -7551,10 +7456,10 @@
     },
     {
       "data": {
-        "checksum": "a69ec16f040d496e7f6901717f9738255f66773b0eb20a96cb19688fe853f937",
-        "contents_checksum": "f4dad17b254ae4340379b1c061410d576644fe22f0a9576d29e343c677afda5a",
-        "size": 57476207,
-        "source": "components/google-cloud-sdk-tests-20240628141907.tar.gz",
+        "checksum": "ed0feffc4e67046a2d15e3f524dc4f7c7278eaf571e06e38031842b357b55879",
+        "contents_checksum": "67a9405c609b6bc0567cfb517d77d2e591a801d3dc482824190fc1ca4f8643cb",
+        "size": 57601363,
+        "source": "components/google-cloud-sdk-tests-20240719191136.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7571,8 +7476,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "2024.06.28"
+        "build_number": 20240719191136,
+        "version_string": "2024.07.19"
       }
     }
   ],
@@ -7591,11 +7496,11 @@
   ],
   "post_processing_command": "components post-process",
   "release_notes_url": "RELEASE_NOTES",
-  "revision": 20240628141907,
+  "revision": 20240719191136,
   "schema_version": {
     "no_update": false,
     "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz",
     "version": 3
   },
-  "version": "483.0.0"
+  "version": "485.0.0"
 }
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index ea4ee77e1254c..04713f6ae3953 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "483.0.0";
+  version = "485.0.0";
   googleCloudSdkPkgs = {
     x86_64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-linux-x86_64.tar.gz";
-        sha256 = "1vp455n1wdm581nzf7gc43v2p6byx8rpa19mcncvgyh2k43p9kqc";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-x86_64.tar.gz";
+        sha256 = "17y6gbn0qnmrmawijg9l3kgygd8mbg57rgf5fcx05x57m7jy07v7";
       };
     x86_64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-darwin-x86_64.tar.gz";
-        sha256 = "1cygr9z23g6xx18dcdgwms6pb4gvapldlsj3fqjjwnzcgmrj41a1";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-darwin-x86_64.tar.gz";
+        sha256 = "0zh6z567dm6a75xi8mz724xg7xw9n7xzp3kbaj01qmvwmri7rahi";
       };
     aarch64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-linux-arm.tar.gz";
-        sha256 = "1k1dasnby7x5jhs9n6rji2g25gasb8mvc679cs5rp78fvq9kbygq";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-arm.tar.gz";
+        sha256 = "0mw80qs8qzjyjlbirqzpc9r22dv5m6i90v3p016na4w4hgc15v33";
       };
     aarch64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-darwin-arm.tar.gz";
-        sha256 = "1sy0pzy9r96p9x604a22z6blqr824fxp16imvwfajqn3c3m65z3g";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-darwin-arm.tar.gz";
+        sha256 = "1x6s521iad1mzi7af0874qh421ldyxc1dd3952ayxi2zm8misg63";
       };
     i686-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-483.0.0-linux-x86.tar.gz";
-        sha256 = "0j219d1p71ys7kkgbjrwjypmwf2cw7p0a17fr0ss3a9x88gzfhnd";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-x86.tar.gz";
+        sha256 = "05b9lg3gnqknx8y5smz2msr61803zib827283bsf7zmmr7bnignh";
       };
   };
 }
diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix
index ccaff8f38ecf9..82f2825bcdea7 100644
--- a/pkgs/tools/admin/netbox2netshot/default.nix
+++ b/pkgs/tools/admin/netbox2netshot/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     description = "Inventory synchronization tool between Netbox and Netshot";
     homepage = "https://github.com/scaleway/netbox2netshot";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "netbox2netshot";
   };
 }
diff --git a/pkgs/tools/admin/rset/default.nix b/pkgs/tools/admin/rset/default.nix
index 32e401ecc40c9..2d6a8da445c1f 100644
--- a/pkgs/tools/admin/rset/default.nix
+++ b/pkgs/tools/admin/rset/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/eradman/rset/raw/${version}/NEWS";
     license = licenses.isc;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # 2023-08-19, fails to compile with glibc-2.38 because of strlcpy.
     # At the time of writing, this was 4 minors behind already and
     # the `paths.patch` didn't apply anymore, so this is now considered
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix
index 40a16f21ab599..6835a5dbb94bf 100644
--- a/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/pkgs/tools/archivers/fsarchiver/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
     '';
     homepage = "https://www.fsarchiver.org/";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "fsarchiver";
   };
diff --git a/pkgs/tools/archivers/quickbms/default.nix b/pkgs/tools/archivers/quickbms/default.nix
index 8915dda1e27e9..9c3aa89774bfd 100644
--- a/pkgs/tools/archivers/quickbms/default.nix
+++ b/pkgs/tools/archivers/quickbms/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Universal script based file extractor and reimporter";
     homepage = "https://aluigi.altervista.org/quickbms.htm";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "quickbms";
   };
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix
index 8a40a6ae10774..6aa2c95fa1407 100644
--- a/pkgs/tools/archivers/wimlib/default.nix
+++ b/pkgs/tools/archivers/wimlib/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wimlib.net";
     description = "Library and program to extract, create, and modify WIM files";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = with licenses; [ gpl3 lgpl3 mit ];
   };
 }
diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix
index 8658dfb5a7aa4..df4dfef93ba1e 100644
--- a/pkgs/tools/audio/accuraterip-checksum/default.nix
+++ b/pkgs/tools/audio/accuraterip-checksum/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Program for computing the AccurateRip checksum of singletrack WAV files";
     homepage = "https://github.com/leo-bogert/accuraterip-checksum";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; linux;
     mainProgram = "accuraterip-checksum";
   };
diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix
index 61025a6baadf5..78a2b80a0cc78 100644
--- a/pkgs/tools/audio/dl-librescore/default.nix
+++ b/pkgs/tools/audio/dl-librescore/default.nix
@@ -39,6 +39,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/LibreScore/dl-librescore";
     license = lib.licenses.mit;
     mainProgram = "dl-librescore";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix
index f135cccbc6cda..9df6a04933e26 100644
--- a/pkgs/tools/audio/isrcsubmit/default.nix
+++ b/pkgs/tools/audio/isrcsubmit/default.nix
@@ -19,6 +19,6 @@ python3Packages.buildPythonApplication rec {
     description = "Script to submit ISRCs from disc to MusicBrainz";
     license = licenses.gpl3Plus;
     homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index bb050788f85ac..3fb6b46a42a81 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "MPRIS 2 support for mpd";
     homepage = "https://github.com/eonpatapon/mpDris2/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "mpDris2";
   };
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 198a5dda05932..5f802f4879036 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,15 +1,15 @@
 { stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper
-, nixosTests, rclone }:
+, nixosTests, rclone, python3 }:
 
 buildGoModule rec {
   pname = "restic";
-  version = "0.16.5";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    hash = "sha256-WwySXQU8eoyQRcI+zF+pIIKLEFheTnqkPTw0IZeUrhA=";
+    hash = "sha256-fd67ZehmgHHd+R/V4hJCREWoY3lFKSTfvbLRgJ0PSAM=";
   };
 
   patches = [
@@ -17,12 +17,14 @@ buildGoModule rec {
     ./0001-Skip-testing-restore-with-permission-failure.patch
   ];
 
-  vendorHash = "sha256-VZTX0LPZkqN4+OaaIkwepbGwPtud8Cu7Uq7t1bAUC8M=";
+  vendorHash = "sha256-tU2msDHktlU0SvvxLQCU64p8DpL8B0QiliVCuHlLTHQ=";
 
   subPackages = [ "cmd/restic" ];
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 
+  nativeCheckInputs = [ python3 ];
+
   passthru.tests.restic = nixosTests.restic;
 
   postPatch = ''
diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix
index 765d0d0789464..08043c391bc94 100644
--- a/pkgs/tools/backup/sigtop/default.nix
+++ b/pkgs/tools/backup/sigtop/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   name = "sigtop";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "tbvdm";
     repo = "sigtop";
     rev = "v${version}";
-    sha256 = "sha256-EQWi+3n3Srsa3MHQym7IIFxxyATnb/79bgy8eqOB46k=";
+    sha256 = "sha256-qNcfnXQmccEnUFtaR3y79yFRZ5xHeOUQ6hEY9LZxm7w=";
   };
 
   vendorHash = "sha256-IFF7zTrHHoEmPoHGOkTHrb7o+9D5PC8Q+MWHSR2EXog=";
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index 0cbcaca81f013..a2f43b15a2dba 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -35,6 +35,6 @@ buildGoModule rec {
     license = licenses.asl20;
     description = "Archival restoration tool for PostgreSQL";
     mainProgram = "wal-g";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix
index 79d0fcd01deaa..fcb3bf7dce964 100644
--- a/pkgs/tools/backup/zfs-autobackup/default.nix
+++ b/pkgs/tools/backup/zfs-autobackup/default.nix
@@ -25,6 +25,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/psy0rz/zfs_autobackup";
     changelog = "https://github.com/psy0rz/zfs_autobackup/releases/tag/v${version}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix
index 12bc55a543977..6be570fadd22d 100644
--- a/pkgs/tools/backup/zfsbackup/default.nix
+++ b/pkgs/tools/backup/zfsbackup/default.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc";
     homepage = "https://github.com/someone1/zfsbackup-go";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "zfsbackup-go";
   };
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 45713d5b8e62b..572a73be3c881 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -8,11 +8,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "blueman";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-B6COCPNtzXxAT9Ve70N5WvWR2VFLKviWPfIg76BLIa0=";
+    sha256 = "sha256-vfxJkJdCy3koj4oR1vZmt1wnE7kcCF5tDdMpQ0eT/oU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix
index abe0c3d81e159..8606614d0186b 100644
--- a/pkgs/tools/cd-dvd/ccd2iso/default.nix
+++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "CloneCD to ISO converter";
     homepage = "https://sourceforge.net/projects/ccd2iso/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "ccd2iso";
   };
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index abbda3512e5f0..cb448ef157e14 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "dvdisaster";
   };
 }
diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix
deleted file mode 100644
index 7d2af1c4898fe..0000000000000
--- a/pkgs/tools/compression/bsc/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, openmp }:
-
-stdenv.mkDerivation rec {
-  pname = "bsc";
-  version = "3.1.0";
-
-  src = fetchFromGitHub {
-    owner = "IlyaGrebnov";
-    repo = "libbsc";
-    rev = version;
-    sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs = lib.optional stdenv.isDarwin openmp;
-
-  postPatch = ''
-    substituteInPlace makefile \
-        --replace 'g++' '$(CXX)'
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    description = "High performance block-sorting data compression library";
-    homepage = "http://libbsc.com/";
-    maintainers = with maintainers; [ ];
-    # Later commits changed the licence to Apache2 (no release yet, though)
-    license = with licenses; [ lgpl3Plus ];
-    platforms = platforms.unix;
-    mainProgram = "bsc";
-  };
-}
diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix
index 9dc85fa6f94b9..d28b5af803efc 100644
--- a/pkgs/tools/compression/gzrt/default.nix
+++ b/pkgs/tools/compression/gzrt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/";
     description = "Gzip Recovery Toolkit";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gzrecover";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix
index 8848d4506486d..9cc3a26f6f5e4 100644
--- a/pkgs/tools/compression/hactool/default.nix
+++ b/pkgs/tools/compression/hactool/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Tool to manipulate common file formats for the Nintendo Switch";
     longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives";
     license = licenses.isc;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "hactool";
   };
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix
index bca4bdd2a31f2..f485bab4a7496 100644
--- a/pkgs/tools/compression/lrzip/default.nix
+++ b/pkgs/tools/compression/lrzip/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "http://ck.kolivas.org/apps/lrzip/";
     description = "CK LRZIP compression program (LZMA + RZIP)";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index 3f37f781041e6..dd2144a168493 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.unix;
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "lzfse";
   };
 }
diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix
index 887ae94e5c994..d2daeb51d514b 100644
--- a/pkgs/tools/compression/lzop/default.nix
+++ b/pkgs/tools/compression/lzop/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "http://www.lzop.org";
     description = "Fast file compressor";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     mainProgram = "lzop";
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 6e9decb1b710a..106b14b81b64f 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://www.zlib.net/pigz/";
     description = "Parallel implementation of gzip for multi-core machines";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.zlib;
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix
index 3d744dfa35fd7..333f29e53a218 100644
--- a/pkgs/tools/compression/rzip/default.nix
+++ b/pkgs/tools/compression/rzip/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://rzip.samba.org/";
     description = "Compression program";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     mainProgram = "rzip";
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 310c6db9b3cd8..a8013bd8600b6 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = if stdenv.isDarwin then [ fuse ] else [ fuse3 ];
 
+  configureFlags = lib.optional stdenv.isDarwin "--disable-macos-fs-link";
+
   postFixup = ''
     ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
   '';
@@ -32,6 +34,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ lovek323 lovesegfault ];
     platforms = lib.platforms.unix;
-    broken = stdenv.isDarwin; # last successful build 2023-11-17
   };
 })
diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix
index e8f17431069b2..3fdfa10907a98 100644
--- a/pkgs/tools/filesystems/exfatprogs/default.nix
+++ b/pkgs/tools/filesystems/exfatprogs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "exFAT filesystem userspace utilities";
     homepage = "https://github.com/exfatprogs/exfatprogs";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index ceefabb57e49e..1b52fa09c8548 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -40,6 +40,6 @@ buildGoModule rec {
     homepage = "https://cloud.google.com/storage/docs/gcs-fuse";
     changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 3cbbf9bfb5843..4a1341dce7b0b 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
     description = "Simple FUSE filesystem for mounting Android devices as a MTP device";
     homepage = "https://github.com/hanwen/go-mtpfs";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     broken = stdenv.isDarwin;
     mainProgram = "go-mtpfs";
   };
diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix
index 7ce74671e5df0..72e7162d987ea 100644
--- a/pkgs/tools/filesystems/rmfuse/default.nix
+++ b/pkgs/tools/filesystems/rmfuse/default.nix
@@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
       in the reMarkable Cloud using the same tools you use on your local
       system.
     '';
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "rmfuse";
   };
 }
diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix
index cc711e57cdb69..1b7e2f17a1afe 100644
--- a/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/pkgs/tools/filesystems/romdirfs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mlafeldt/romdirfs";
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "romdirfs";
   };
 }
diff --git a/pkgs/tools/games/mymcplus/default.nix b/pkgs/tools/games/mymcplus/default.nix
index acd5a121f4d11..9fa3c77978520 100644
--- a/pkgs/tools/games/mymcplus/default.nix
+++ b/pkgs/tools/games/mymcplus/default.nix
@@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec {
     description = "PlayStation 2 memory card manager";
     mainProgram = "mymcplus";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/graphics/cgif/default.nix b/pkgs/tools/graphics/cgif/default.nix
index f581a97759b83..7f35f42ccae26 100644
--- a/pkgs/tools/graphics/cgif/default.nix
+++ b/pkgs/tools/graphics/cgif/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/dloebl/cgif";
     description = "CGIF, a GIF encoder written in C";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/tools/graphics/deqp-runner/default.nix b/pkgs/tools/graphics/deqp-runner/default.nix
index 101832176907b..cafd083de5286 100644
--- a/pkgs/tools/graphics/deqp-runner/default.nix
+++ b/pkgs/tools/graphics/deqp-runner/default.nix
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://gitlab.freedesktop.org/anholt/deqp-runner";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index bab4395d3e7c9..4ac98c9551e25 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}";
     platforms = lib.platforms.all;
     license = lib.licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index d969024f2b5d8..ef8a9e29588ef 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "Command-line screen capture utility";
     mainProgram = "scrot";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.mitAdvertising;
   };
 }
diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
index 790ef79ea09ee..bd900d455d6d3 100644
--- a/pkgs/tools/graphics/twilight/default.nix
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = src.meta.homepage;
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "twilight";
   };
 }
diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/tools/graphics/vkbasalt-cli/default.nix
index 237aad77f1265..855daf39ccee7 100644
--- a/pkgs/tools/graphics/vkbasalt-cli/default.nix
+++ b/pkgs/tools/graphics/vkbasalt-cli/default.nix
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
     description = "Command-line utility for vkBasalt";
     homepage = "https://gitlab.com/TheEvilSkeleton/vkbasalt-cli";
     license = with licenses; [ lgpl3Only gpl3Only ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "vkbasalt";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
index 2e322d24a7ad4..e72760e73539c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     description = "Thai input method engine for IBus";
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix
index 8515849f3a9ed..b095cee4d7958 100644
--- a/pkgs/tools/misc/3llo/default.nix
+++ b/pkgs/tools/misc/3llo/default.nix
@@ -11,6 +11,6 @@ bundlerApp {
     description = "Trello interactive CLI on terminal";
     license = licenses.mit;
     homepage = "https://github.com/qcam/3llo";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix
index 4a87c9692ca9a..66a776935049e 100644
--- a/pkgs/tools/misc/adafruit-ampy/default.nix
+++ b/pkgs/tools/misc/adafruit-ampy/default.nix
@@ -21,7 +21,7 @@ buildPythonApplication rec {
     homepage = "https://github.com/pycampers/ampy";
     license = licenses.mit;
     description = "Utility to interact with a MicroPython board over a serial connection";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "ampy";
   };
 }
diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix
index 7b80c2a5d9bd3..dd0c8cf67b0b4 100644
--- a/pkgs/tools/misc/apparix/default.nix
+++ b/pkgs/tools/misc/apparix/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "http://micans.org/apparix";
     description = "Add directory bookmarks, distant listing, and distant editing to the command line";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     mainProgram = "apparix";
diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix
index b5b9cd5ec7514..da3375ac6d68b 100644
--- a/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/pkgs/tools/misc/bdf2sfd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/fcambus/bdf2sfd";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "bdf2sfd";
   };
 }
diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 6b7fc82e0d014..ca0f6705b9fe4 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     platforms = platforms.linux;
     mainProgram = "ckb-next";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix
index 05231d2b16e67..cb1a55b069578 100644
--- a/pkgs/tools/misc/claws/default.nix
+++ b/pkgs/tools/misc/claws/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     homepage = "https://github.com/thehowl/claws";
     description = "Interactive command line client for testing websocket servers";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "claws";
   };
 }
diff --git a/pkgs/tools/misc/clpeak/default.nix b/pkgs/tools/misc/clpeak/default.nix
index 4b190acf19b7c..6060a2078113e 100644
--- a/pkgs/tools/misc/clpeak/default.nix
+++ b/pkgs/tools/misc/clpeak/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Tool which profiles OpenCL devices to find their peak capacities";
     homepage = "https://github.com/krrishnarraj/clpeak/";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "clpeak";
   };
 }
diff --git a/pkgs/tools/misc/cp210x-program/default.nix b/pkgs/tools/misc/cp210x-program/default.nix
index d53a406c3cdc4..50c6daab1bfae 100644
--- a/pkgs/tools/misc/cp210x-program/default.nix
+++ b/pkgs/tools/misc/cp210x-program/default.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "EEPROM tool for Silabs CP210x USB-Serial adapter";
     homepage = "https://github.com/VCTLabs/cp210x-program";
     license = licenses.lgpl21Only; # plus/only status unclear
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "cp210x-program";
   };
 }
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index f2f9353f403a6..600dc5dd850e1 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -23,7 +23,7 @@ buildGoModule rec {
     description = "Dash Generator Script for Any HTML";
     homepage = "https://github.com/technosophos/dashing";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "dashing";
   };
 }
diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix
index cdd7b840a1d31..de5c07041fdb4 100644
--- a/pkgs/tools/misc/dbus-map/default.nix
+++ b/pkgs/tools/misc/dbus-map/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/taviso/dbusmap";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "dbus-map";
   };
 }
diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix
index 570882d59ab9a..aa9220da60d19 100644
--- a/pkgs/tools/misc/detox/default.nix
+++ b/pkgs/tools/misc/detox/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "detox";
   };
 }
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
index db2c2f5e146f1..e3b6b73673b46 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/pkgs/tools/misc/ding-libs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "'D is not GLib' utility libraries";
     homepage = "https://pagure.io/SSSD/ding-libs";
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     license = [ lib.licenses.gpl3 lib.licenses.lgpl3 ];
   };
 }
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix
index 6f6a322cc28f5..ad28d569c6e29 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/pkgs/tools/misc/docker-ls/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     '';
 
     homepage = "https://github.com/mayflower/docker-ls";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = docker.meta.platforms;
     license = licenses.mit;
   };
diff --git a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
index 25e5d44752307..8b0c96316c974 100644
--- a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
+++ b/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
@@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation {
     homepage = "https://gitlab.com/dwt1/shell-color-scripts";
     description = "Collection of shell color scripts collected by dt (Derek Taylor)";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "colorscript";
   };
diff --git a/pkgs/tools/misc/enjarify/default.nix b/pkgs/tools/misc/enjarify/default.nix
index 0a146dc02f321..4e4f21430132e 100644
--- a/pkgs/tools/misc/enjarify/default.nix
+++ b/pkgs/tools/misc/enjarify/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Tool for translating Dalvik bytecode to equivalent Java bytecode";
     homepage = "https://github.com/google/enjarify/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "enjarify";
   };
 }
diff --git a/pkgs/tools/misc/envchain/default.nix b/pkgs/tools/misc/envchain/default.nix
index 643eb86cb576a..984dd60082e39 100644
--- a/pkgs/tools/misc/envchain/default.nix
+++ b/pkgs/tools/misc/envchain/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/sorah/envchain";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "envchain";
   };
 }
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index 76c7731e27f2c..45ec3d6ddfdd9 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "fasd";
   };
 }
diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix
index 83d709637b1dd..6783e9dc80cf3 100644
--- a/pkgs/tools/misc/flowgger/default.nix
+++ b/pkgs/tools/misc/flowgger/default.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/awslabs/flowgger";
     description = "Fast, simple and lightweight data collector written in Rust";
     license = licenses.bsd2;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     mainProgram = "flowgger";
   };
 }
diff --git a/pkgs/tools/misc/fntsample/default.nix b/pkgs/tools/misc/fntsample/default.nix
index 6600b7fab72b3..6ddbace3c0b7b 100644
--- a/pkgs/tools/misc/fntsample/default.nix
+++ b/pkgs/tools/misc/fntsample/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/eugmes/fntsample";
     description = "PDF and PostScript font samples generator";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/tools/misc/fx-cast-bridge/default.nix
index 11402d8f455c8..8ea1c785b01b4 100644
--- a/pkgs/tools/misc/fx-cast-bridge/default.nix
+++ b/pkgs/tools/misc/fx-cast-bridge/default.nix
@@ -52,7 +52,7 @@ buildNpmPackage rec {
     description = "Implementation of the Chrome Sender API (Chromecast) within Firefox";
     homepage = "https://hensm.github.io/fx_cast/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "fx_cast_bridge";
   };
 }
diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix
index e041202576fbc..e5285cba642cf 100644
--- a/pkgs/tools/misc/fxlinuxprintutil/default.nix
+++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     homepage = "https://onlinesupport.fujixerox.com";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/tools/misc/gigalixir/default.nix
index d03d353a088bd..101b5f6a93468 100644
--- a/pkgs/tools/misc/gigalixir/default.nix
+++ b/pkgs/tools/misc/gigalixir/default.nix
@@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Gigalixir Command-Line Interface";
     homepage = "https://github.com/gigalixir/gigalixir-cli";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gigalixir";
   };
 }
diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix
index e6505129b5b93..c2c91f0574ac7 100644
--- a/pkgs/tools/misc/goose/default.nix
+++ b/pkgs/tools/misc/goose/default.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     description = "Database migration tool which supports SQL migrations and Go functions";
     homepage = "https://pressly.github.io/goose/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "goose";
   };
 }
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index 8b5a5fb88d333..0768b551fe10d 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
     mainProgram = "gosu";
     homepage = "https://github.com/tianon/gosu";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix
index c5901a6cd6e19..cedd2ae95bc82 100644
--- a/pkgs/tools/misc/gotify-cli/default.nix
+++ b/pkgs/tools/misc/gotify-cli/default.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
     license = licenses.mit;
     homepage = "https://github.com/gotify/cli";
     description = "Command line interface for pushing messages to gotify/server";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gotify";
   };
 }
diff --git a/pkgs/tools/misc/gummy/default.nix b/pkgs/tools/misc/gummy/default.nix
index 489c688880c5b..8e75d2ab1a6eb 100644
--- a/pkgs/tools/misc/gummy/default.nix
+++ b/pkgs/tools/misc/gummy/default.nix
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
       via backlight (currently only for embedded displays) and gamma. Multiple monitors are supported.
     '';
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/tools/misc/hex/default.nix
index f3413e766f6c9..f7f8300807829 100644
--- a/pkgs/tools/misc/hex/default.nix
+++ b/pkgs/tools/misc/hex/default.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/sitkevij/hex/releases/tag/v${version}";
     mainProgram = "hx";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix
index e15476cca08c5..2eeb467211d2d 100644
--- a/pkgs/tools/misc/html-proofer/default.nix
+++ b/pkgs/tools/misc/html-proofer/default.nix
@@ -14,7 +14,7 @@ bundlerEnv rec {
     description = "Tool to validate HTML files";
     homepage    = "https://github.com/gjtorikian/html-proofer";
     license     = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.unix;
     mainProgram = "htmlproofer";
   };
diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix
index d1646f92c7bac..2647b65687722 100644
--- a/pkgs/tools/misc/hyperledger-fabric/default.nix
+++ b/pkgs/tools/misc/hyperledger-fabric/default.nix
@@ -52,6 +52,6 @@ buildGoModule rec {
     '';
     homepage = "https://wiki.hyperledger.org/display/fabric";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix
index 21d0600d92b13..b02e581329394 100644
--- a/pkgs/tools/misc/immich-cli/default.nix
+++ b/pkgs/tools/misc/immich-cli/default.nix
@@ -5,13 +5,13 @@
 }:
 
 let
-  version = "2.2.4";
+  version = "2.2.12";
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     # Using a fixed commit until upstream has release tags for cli.
-    rev = "8c2195c8205156f6e3168cc52fa34db334568ea9";
-    hash = "sha256-Tseu6aIrYU4Af/jWDi2wDtP77n/aogp7Qkn9mosMaes=";
+    rev = "04340b3a6210dc7a00359e781815ee0b9cd1b8fd";
+    hash = "sha256-PS1aZ6fcOudWlCFPuTeLBu3QrgUYnEuI5pBq3GGJ/bc=";
   };
   meta' = {
     description = "CLI utilities for Immich to help upload images and videos";
@@ -25,7 +25,7 @@ let
     pname = "immich-cli-openapi-typescript-sdk";
     inherit src version;
 
-    npmDepsHash = "sha256-WhNdFaFBwb6ehEQgbNJGdzPb3FdJk1Nefi8DcJfY9Wc=";
+    npmDepsHash = "sha256-TRFN+xg8BdvzJKP1Y7GJsoRaWqdGoxS3qYx1OlhnOoY=";
 
     postPatch = ''
       cd open-api/typescript-sdk
@@ -44,7 +44,7 @@ let
     pname = "immich-cli";
     inherit src version;
 
-    npmDepsHash = "sha256-aSTN+I8B/aLT2ItGoyZTlbdn1VCK0ZmOb1QG7ZQuz+Q=";
+    npmDepsHash = "sha256-rzjfGqYxrfGQHRCMiEpP229eSHCWVugMohQ/ZL1r1EQ=";
 
     postPatch = ''
       ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 9d311a30d0fb9..049b69fa7661e 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/jbruchon/jdupes";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "jdupes";
   };
 }
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 5945ce4d4fe25..15310fb9350a8 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -33,7 +33,7 @@ buildPythonApplication rec {
     description = "Tool helps to deploy a kubernetes cluster with Ansible";
     platforms = platforms.all;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "kargo";
   };
 }
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix
index 03a01da3e5efc..d30f8465ff379 100644
--- a/pkgs/tools/misc/ldapvi/default.nix
+++ b/pkgs/tools/misc/ldapvi/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     '';
     homepage = "http://www.lichteblau.com/ldapvi/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "ldapvi";
   };
diff --git a/pkgs/tools/misc/lerpn/default.nix b/pkgs/tools/misc/lerpn/default.nix
index f6714310f2989..fcbd6e9513cd8 100644
--- a/pkgs/tools/misc/lerpn/default.nix
+++ b/pkgs/tools/misc/lerpn/default.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication {
   meta = with lib; {
     homepage = "https://gitea.alexisvl.rocks/alexisvl/lerpn";
     description = "Curses RPN calculator written in straight Python";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl3Plus;
     mainProgram = "lerpn";
   };
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
index 4e997c65565a8..baaba91647695 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Bitcoin client query library";
     homepage = "https://github.com/libbitcoin/libbitcoin-client";
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
 
     # AGPL with a lesser clause
     license = licenses.agpl3Plus;
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
index cebd5090bfe50..b7162ede7e5a1 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "C++ library for building bitcoin applications";
     homepage = "https://libbitcoin.info/";
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # AGPL with a lesser clause
     license = licenses.agpl3Plus;
   };
diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix
index 2d2f6272fddfa..64c0c9b9b3ff2 100644
--- a/pkgs/tools/misc/logstash/contrib.nix
+++ b/pkgs/tools/misc/logstash/contrib.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage    = "https://github.com/elasticsearch/logstash-contrib";
     license     = lib.licenses.asl20;
     platforms   = lib.platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/tools/misc/maker-panel/default.nix
index 7fc5ec9f3c774..87aab302f2169 100644
--- a/pkgs/tools/misc/maker-panel/default.nix
+++ b/pkgs/tools/misc/maker-panel/default.nix
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
     description = "Make mechanical PCBs by combining shapes together";
     homepage = "https://github.com/twitchyliquid64/maker-panel";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix
index fa9bb1695fab9..ae70a319e65f0 100644
--- a/pkgs/tools/misc/mandown/default.nix
+++ b/pkgs/tools/misc/mandown/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     description = "Markdown to groff (man page) converter";
     homepage = "https://gitlab.com/kornelski/mandown";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mandown";
   };
 }
diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix
index 397533883014a..178e78bee6ffa 100644
--- a/pkgs/tools/misc/markdown-anki-decks/default.nix
+++ b/pkgs/tools/misc/markdown-anki-decks/default.nix
@@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/lukesmurray/markdown-anki-decks";
     changelog = "https://github.com/lukesmurray/markdown-anki-decks/blob/${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "mdankideck";
   };
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index a1f1e7027028e..0c33de89eecd1 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -37,7 +37,7 @@ buildGoModule rec {
     description = "Easily rename multiple files using your text editor";
     license = licenses.mit;
     homepage = "https://github.com/laurent22/massren";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "massren";
   };
 }
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index a4c934e9a6a45..66707a492f0e8 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description  = "Tool for buffering data streams with a large set of unique features";
     homepage = "https://www.maier-komor.de/mbuffer.html";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux; # Maybe other non-darwin Unix
     mainProgram = "mbuffer";
   };
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index 05299e60845a6..c543a7720554b 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = ".mdb (MS Access) format tools";
     license = with licenses; [ gpl2Plus lgpl2 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     inherit (src.meta) homepage;
   };
diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix
index ec742b11c98ef..cd9ebe5816e4d 100644
--- a/pkgs/tools/misc/me_cleaner/default.nix
+++ b/pkgs/tools/misc/me_cleaner/default.nix
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage rec {
       with the final purpose of reducing its ability to interact with the system.
     '';
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "me_cleaner.py";
   };
 }
diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix
index 3a06da1e85855..c4fa482032165 100644
--- a/pkgs/tools/misc/mloader/default.nix
+++ b/pkgs/tools/misc/mloader/default.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
     description = "Command-line tool to download manga from mangaplus";
     homepage = "https://github.com/hurlenko/mloader";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mloader";
   };
 }
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix
index bf8899b4003e9..4ae61095fff56 100644
--- a/pkgs/tools/misc/mlocate/default.nix
+++ b/pkgs/tools/misc/mlocate/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = "https://pagure.io/mlocate";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/tools/misc/mmv-go/default.nix
index da1f443c6736d..2a4c74ddea01e 100644
--- a/pkgs/tools/misc/mmv-go/default.nix
+++ b/pkgs/tools/misc/mmv-go/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     homepage = "https://github.com/itchyny/mmv";
     description = "Rename multiple files using your $EDITOR";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "mmv";
   };
 }
diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/tools/misc/netbootxyz-efi/default.nix
index 89ffb7094442d..f09a86fd76a30 100644
--- a/pkgs/tools/misc/netbootxyz-efi/default.nix
+++ b/pkgs/tools/misc/netbootxyz-efi/default.nix
@@ -15,7 +15,7 @@ in fetchurl {
     homepage = "https://netboot.xyz/";
     description = "Tool to boot OS installers and utilities over the network, to be run from a bootloader";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/node-glob/default.nix b/pkgs/tools/misc/node-glob/default.nix
index 4b3cde4edd9f2..74013b27b3059 100644
--- a/pkgs/tools/misc/node-glob/default.nix
+++ b/pkgs/tools/misc/node-glob/default.nix
@@ -24,6 +24,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/isaacs/node-glob";
     license = lib.licenses.isc;
     mainProgram = "glob";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/ntfy/webpush.nix b/pkgs/tools/misc/ntfy/webpush.nix
index cd58c5208e83c..a9c87d8738907 100644
--- a/pkgs/tools/misc/ntfy/webpush.nix
+++ b/pkgs/tools/misc/ntfy/webpush.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
     description = "cloudbell webpush notification support for ntfy";
     homepage = "https://dschep.github.io/ntfy-webpush/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/nux/default.nix b/pkgs/tools/misc/nux/default.nix
index d1d44a35c20c5..45bb183626050 100644
--- a/pkgs/tools/misc/nux/default.nix
+++ b/pkgs/tools/misc/nux/default.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/NuxPackage/nux";
     description = "Wrapper over the nix cli";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "nux";
   };
 }
diff --git a/pkgs/tools/misc/oggvideotools/default.nix b/pkgs/tools/misc/oggvideotools/default.nix
index 144c89f802af9..13c13f086a290 100644
--- a/pkgs/tools/misc/oggvideotools/default.nix
+++ b/pkgs/tools/misc/oggvideotools/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "Toolbox for manipulating and creating Ogg video files";
     homepage = "http://www.streamnik.de/oggvideotools.html";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # Compilation error on Darwin:
     # error: invalid argument '--std=c++0x' not allowed with 'C'
     # make[2]: *** [src/libresample/CMakeFiles/resample.dir/build.make:76: src/libresample/CMakeFiles/resample.dir/filterkit.c.o] Error 1
diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix
index f09a6b45cbed8..54b9e11b74757 100644
--- a/pkgs/tools/misc/oppai-ng/default.nix
+++ b/pkgs/tools/misc/oppai-ng/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Difficulty and pp calculator for osu!";
     homepage = "https://github.com/Francesco149/oppai-ng";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "oppai";
     platforms = platforms.all;
   };
diff --git a/pkgs/tools/misc/panicparse/default.nix b/pkgs/tools/misc/panicparse/default.nix
index 6cf97eca5a971..7059864791b8e 100644
--- a/pkgs/tools/misc/panicparse/default.nix
+++ b/pkgs/tools/misc/panicparse/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
     description = "Crash your app in style (Golang)";
     homepage = "https://github.com/maruel/panicparse";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "panicparse";
   };
 }
diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix
index ab9c9e433c68f..964f08ac27759 100644
--- a/pkgs/tools/misc/paps/default.nix
+++ b/pkgs/tools/misc/paps/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Pango to PostScript converter";
     homepage = "https://github.com/dov/paps";
     license = licenses.lgpl2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "paps";
   };
diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix
index b7a05116f38b2..4b9a9bdf04c12 100644
--- a/pkgs/tools/misc/pazi/default.nix
+++ b/pkgs/tools/misc/pazi/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Autojump \"zap to directory\" helper";
     homepage = "https://github.com/euank/pazi";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pazi";
   };
 }
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 1ffeaede331cb..1117c0cae8bff 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
     homepage = "http://pipelight.net/";
     license = with lib.licenses; [ mpl11 gpl2Only lgpl21 ];
     description = "Wrapper for using Windows plugins in Linux browsers";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" "i686-linux" ];
     mainProgram = "pipelight-plugin";
   };
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index c9378d7c3d40b..90aed233e983f 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "powerline-shell rewritten in Rust, inspired by powerline-go";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "powerline-rs";
   };
diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/tools/misc/procyon/default.nix
index 7026ce6febfbb..984459f2a4f60 100644
--- a/pkgs/tools/misc/procyon/default.nix
+++ b/pkgs/tools/misc/procyon/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     homepage = "https://github.com/mstrobel/procyon/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "procyon";
   };
 }
diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/tools/misc/qmk_hid/default.nix
index b0835dbcb5770..f838f1b8ece4c 100644
--- a/pkgs/tools/misc/qmk_hid/default.nix
+++ b/pkgs/tools/misc/qmk_hid/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     description = "Commandline tool for interactng with QMK devices over HID";
     homepage = "https://github.com/FrameworkComputer/qmk_hid";
     license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "qmk_hid";
   };
 }
diff --git a/pkgs/tools/misc/rkvm/default.nix b/pkgs/tools/misc/rkvm/default.nix
index 1e5376273ca8f..4dee8423437bf 100644
--- a/pkgs/tools/misc/rkvm/default.nix
+++ b/pkgs/tools/misc/rkvm/default.nix
@@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/scdl/default.nix b/pkgs/tools/misc/scdl/default.nix
index 6ddc72aa81b3b..e79117c1faf45 100644
--- a/pkgs/tools/misc/scdl/default.nix
+++ b/pkgs/tools/misc/scdl/default.nix
@@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
     description = "Download Music from Soundcloud";
     homepage = "https://github.com/flyingrub/scdl";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "scdl";
   };
 }
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index b79d0067480eb..df5035639bf69 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
       '';
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/script-directory/default.nix b/pkgs/tools/misc/script-directory/default.nix
index 55be6b327f3e3..1cd0218c30dcd 100644
--- a/pkgs/tools/misc/script-directory/default.nix
+++ b/pkgs/tools/misc/script-directory/default.nix
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/ianthehenry/sd";
     changelog = "https://github.com/ianthehenry/sd/tree/${src.rev}#changelog";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "sd";
   };
 }
diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index b3903bd951536..f993d25943382 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     description = "Queries a selection from the user and prints to stdout";
     platforms = lib.platforms.linux;
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "slop";
   };
 }
diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix
index 9bae5eb519254..6298d84c41fd6 100644
--- a/pkgs/tools/misc/tab-rs/default.nix
+++ b/pkgs/tools/misc/tab-rs/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     description = "Intuitive, config-driven terminal multiplexer designed for software & systems engineers";
     homepage = "https://github.com/austinjones/tab-rs";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tab";
     broken = (stdenv.isDarwin && stdenv.isAarch64); # Added 2023-11-13
   };
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index 373be087bf6fc..dccf9d38fe6a2 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     description = "Play an image/video in your terminal";
     homepage = "https://jd91mzm2.github.io/termplay/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "termplay";
   };
diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix
index 86217693a58fd..2de15e155c584 100644
--- a/pkgs/tools/misc/termtosvg/default.nix
+++ b/pkgs/tools/misc/termtosvg/default.nix
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://nbedos.github.io/termtosvg/";
     description = "Record terminal sessions as SVG animations";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "termtosvg";
   };
 }
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 4352c20f833d0..a386a46c40f15 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -58,6 +58,6 @@ rustPlatform.buildRustPackage rec {
     description = "Suite of tools for manipulating the metadata of the dm-thin device-mapper target";
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix
index c57d5ac1d7572..6ecf2723f00b2 100644
--- a/pkgs/tools/misc/trackma/default.nix
+++ b/pkgs/tools/misc/trackma/default.nix
@@ -77,6 +77,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "Open multi-site list manager for Unix-like systems (ex-wMAL)";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/tools/misc/twspace-dl/default.nix
index 1345a25eb1bb7..3e22188f5df9c 100644
--- a/pkgs/tools/misc/twspace-dl/default.nix
+++ b/pkgs/tools/misc/twspace-dl/default.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/HoloArchivists/twspace-dl";
     changelog = "https://github.com/HoloArchivists/twspace-dl/releases/tag/${version}";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "twspace_dl";
   };
 }
diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock
index dfccefda9e01b..717a59c9ad62b 100644
--- a/pkgs/tools/misc/vector/Cargo.lock
+++ b/pkgs/tools/misc/vector/Cargo.lock
@@ -116,9 +116,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "amq-protocol"
-version = "7.1.2"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d40d8b2465c7959dd40cee32ba6ac334b5de57e9fca0cc756759894a4152a5d"
+checksum = "0f0234884b3641db74d22ccc20fc2594db5f23d7d41ade5c93d7ee33d200960c"
 dependencies = [
  "amq-protocol-tcp",
  "amq-protocol-types",
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "amq-protocol-tcp"
-version = "7.1.2"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cb2100adae7da61953a2c3a01935d86caae13329fadce3333f524d6d6ce12e2"
+checksum = "265dca43d9dbb3d5bbb0b3ef1b0cd9044ce3aa5d697d5b66cde974d1f6063f09"
 dependencies = [
  "amq-protocol-uri",
  "tcp-stream",
@@ -141,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "amq-protocol-types"
-version = "7.1.2"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "156ff13c8a3ced600b4e54ed826a2ae6242b6069d00dd98466827cef07d3daff"
+checksum = "c7412353b58923fa012feb9a64ccc0c811747babee2e5a2fd63eb102dc8054c3"
 dependencies = [
  "cookie-factory",
  "nom",
@@ -153,9 +153,9 @@ dependencies = [
 
 [[package]]
 name = "amq-protocol-uri"
-version = "7.1.2"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "751bbd7d440576066233e740576f1b31fdc6ab86cfabfbd48c548de77eca73e4"
+checksum = "2be91352c805d5704784e079117d5291fd5bf2569add53c914ebce6d1a795d33"
 dependencies = [
  "amq-protocol-types",
  "percent-encoding",
@@ -442,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "async-graphql"
-version = "7.0.6"
+version = "7.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf338d20ba5bab309f55ce8df95d65ee19446f7737f06f4a64593ab2c6b546ad"
+checksum = "2b76aba2f176af685c2229633881a3adeae51f87ae1811781e73910b7001c93e"
 dependencies = [
  "async-graphql-derive",
  "async-graphql-parser",
@@ -452,7 +452,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "base64 0.22.1",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "fnv",
  "futures-util",
@@ -473,26 +473,26 @@ dependencies = [
 
 [[package]]
 name = "async-graphql-derive"
-version = "7.0.6"
+version = "7.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc51fd6b7102acda72bc94e8ae1543844d5688ff394a6cf7c21f2a07fe2d64e4"
+checksum = "72e2e26a6b44bc61df3ca8546402cf9204c28e30c06084cc8e75cd5e34d4f150"
 dependencies = [
  "Inflector",
  "async-graphql-parser",
  "darling 0.20.8",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "strum 0.26.2",
- "syn 2.0.66",
+ "syn 2.0.72",
  "thiserror",
 ]
 
 [[package]]
 name = "async-graphql-parser"
-version = "7.0.6"
+version = "7.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75361eefd64e39f89bead4cb45fddbaf60ddb0e7b15fb7c852b6088bcd63071f"
+checksum = "f801451484b4977d6fe67b29030f81353cabdcbb754e5a064f39493582dac0cf"
 dependencies = [
  "async-graphql-value",
  "pest",
@@ -502,11 +502,11 @@ dependencies = [
 
 [[package]]
 name = "async-graphql-value"
-version = "7.0.6"
+version = "7.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f665d2d52b41c4ed1f01c43f3ef27a2fe0af2452ed5c8bc7ac9b1a8719afaa"
+checksum = "69117c43c01d81a69890a9f5dd6235f2f027ca8d1ec62d6d3c5e01ca0edb4f2b"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "indexmap 2.2.6",
  "serde",
  "serde_json",
@@ -514,9 +514,9 @@ dependencies = [
 
 [[package]]
 name = "async-graphql-warp"
-version = "7.0.6"
+version = "7.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400c0f2609939f8cec46d8137f0959a49a4a514458f2a43a4ee0b0f6eb20a36"
+checksum = "4c3082de64b6d8e3956fa92e3009c27db209aa17388abf7a7d766adc6bb9b8ba"
 dependencies = [
  "async-graphql",
  "futures-util",
@@ -592,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures 0.3.30",
  "http 0.2.9",
  "memchr",
@@ -665,9 +665,9 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -705,9 +705,9 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -718,21 +718,15 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
-[[package]]
-name = "atomic"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
-
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -762,7 +756,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fastrand 2.0.1",
  "http 0.2.9",
  "hyper 0.14.28",
@@ -792,7 +786,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "http-body 0.4.5",
  "pin-project-lite",
@@ -860,7 +854,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fastrand 2.0.1",
  "http 0.2.9",
  "regex",
@@ -883,7 +877,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "regex",
  "tracing 0.1.40",
@@ -905,7 +899,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "regex",
  "tracing 0.1.40",
@@ -927,7 +921,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "regex",
  "tracing 0.1.40",
@@ -953,7 +947,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "http-body 0.4.5",
  "once_cell",
@@ -979,7 +973,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fastrand 2.0.1",
  "http 0.2.9",
  "regex",
@@ -1025,7 +1019,7 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "regex",
  "tracing 0.1.40",
@@ -1056,16 +1050,16 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31eed8d45759b2c5fe7fd304dd70739060e9e0de509209036eabea14d0720cce"
+checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
  "aws-smithy-http",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "form_urlencoded",
  "hex",
  "hmac",
@@ -1097,7 +1091,7 @@ checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "crc32c",
  "crc32fast",
  "hex",
@@ -1117,20 +1111,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858"
 dependencies = [
  "aws-smithy-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "crc32fast",
 ]
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.60.8"
+version = "0.60.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08"
+checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "bytes-utils",
  "futures-core",
  "http 0.2.9",
@@ -1163,15 +1157,15 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.6.0"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db83b08939838d18e33b5dbaf1a0f048f28c10bd28071ab7ce6f245451855414"
+checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fastrand 2.0.1",
  "h2 0.3.26",
  "http 0.2.9",
@@ -1190,13 +1184,13 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b570ea39eb95bd32543f6e4032bce172cb6209b9bc8c83c770d08169e875afc"
+checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "http 1.1.0",
  "pin-project-lite",
@@ -1212,7 +1206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5"
 dependencies = [
  "base64-simd",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "bytes-utils",
  "http 0.2.9",
  "http 1.1.0",
@@ -1239,15 +1233,14 @@ dependencies = [
 
 [[package]]
 name = "aws-types"
-version = "1.3.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f734808d43702a67e57d478a12e227d4d038d0b90c9005a78c87890d3805922"
+checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "http 0.2.9",
  "rustc_version 0.4.0",
  "tracing 0.1.40",
 ]
@@ -1261,7 +1254,7 @@ dependencies = [
  "async-trait",
  "axum-core",
  "bitflags 1.3.2",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-util",
  "http 0.2.9",
  "http-body 0.4.5",
@@ -1288,7 +1281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
 dependencies = [
  "async-trait",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-util",
  "http 0.2.9",
  "http-body 0.4.5",
@@ -1306,7 +1299,7 @@ checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "dyn-clone",
  "futures 0.3.30",
  "getrandom 0.2.15",
@@ -1355,7 +1348,7 @@ dependencies = [
  "RustyXML",
  "async-trait",
  "azure_core",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures 0.3.30",
  "hmac",
  "log",
@@ -1377,7 +1370,7 @@ dependencies = [
  "RustyXML",
  "azure_core",
  "azure_storage",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures 0.3.30",
  "log",
  "serde",
@@ -1518,7 +1511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721"
 dependencies = [
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1584,7 +1577,7 @@ checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c"
 dependencies = [
  "base64 0.22.1",
  "bollard-stubs",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "futures-core",
  "futures-util",
@@ -1625,7 +1618,7 @@ dependencies = [
  "chrono",
  "serde",
  "serde_repr",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
 ]
 
 [[package]]
@@ -1646,9 +1639,9 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3"
 dependencies = [
  "once_cell",
  "proc-macro-crate 2.0.0",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
  "syn_derive",
 ]
 
@@ -1739,16 +1732,16 @@ version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
@@ -1768,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 dependencies = [
  "serde",
 ]
@@ -1781,7 +1774,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "either",
 ]
 
@@ -1793,9 +1786,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
 [[package]]
 name = "cargo_toml"
-version = "0.20.2"
+version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cb1d556b8b8f36e5ca74938008be3ac102f5dcb5b68a0477e4249ae2291cd3"
+checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965"
 dependencies = [
  "serde",
  "toml",
@@ -2010,9 +2003,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2030,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2043,23 +2036,23 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.5"
+version = "4.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4"
+checksum = "faa2032320fd6f50d22af510d204b2994eef49600dfbd0e771a166213844e4cd"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2091,16 +2084,17 @@ name = "codecs"
 version = "0.1.0"
 dependencies = [
  "apache-avro",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "csv-core",
  "derivative",
  "dyn-clone",
  "futures 0.3.30",
  "indoc",
+ "influxdb-line-protocol",
  "memchr",
  "once_cell",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "prost 0.12.6",
  "prost-reflect",
  "regex",
@@ -2169,7 +2163,7 @@ version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-core",
  "memchr",
  "pin-project-lite",
@@ -2473,7 +2467,7 @@ dependencies = [
  "crossterm_winapi",
  "futures-core",
  "libc",
- "mio",
+ "mio 0.8.11",
  "parking_lot",
  "signal-hook",
  "signal-hook-mio",
@@ -2565,16 +2559,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest",
  "fiat-crypto",
- "platforms 3.1.2",
  "rustc_version 0.4.0",
  "subtle",
  "zeroize",
@@ -2586,9 +2579,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2619,7 +2612,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "strsim 0.10.0",
  "syn 1.0.109",
@@ -2633,10 +2626,10 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "strsim 0.10.0",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2658,7 +2651,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core 0.20.8",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2680,6 +2673,20 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -2694,9 +2701,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "databend-client"
-version = "0.18.3"
+version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afe21f4ac2e61c9360d5c1b7cce3ed4392c2a42c6c1dbb1115cc27f25f23b78"
+checksum = "5cc64f96aeac28470097189078b972a2dcbb398a019069ad0d2503843544bb55"
 dependencies = [
  "async-trait",
  "log",
@@ -2721,14 +2728,13 @@ checksum = "b72465f46d518f6015d9cf07f7f3013a95dd6b9c2747c3d65ae0cce43929d14f"
 
 [[package]]
 name = "deadpool"
-version = "0.9.5"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e"
+checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490"
 dependencies = [
  "async-trait",
  "deadpool-runtime",
  "num_cpus",
- "retain_mut",
  "tokio",
 ]
 
@@ -2771,7 +2777,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -2782,9 +2788,9 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2794,7 +2800,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case 0.4.0",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "rustc_version 0.4.0",
  "syn 1.0.109",
@@ -2866,17 +2872,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "displaydoc"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "dns-lookup"
 version = "2.0.4"
@@ -2925,7 +2920,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-util",
  "moka",
  "octseq",
@@ -3080,7 +3075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -3092,9 +3087,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3104,9 +3099,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
 dependencies = [
  "once_cell",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3124,9 +3119,9 @@ version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3157,9 +3152,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
+checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3324,11 +3319,11 @@ name = "file-source"
 version = "0.1.0"
 dependencies = [
  "bstr 1.9.1",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "crc",
  "criterion",
- "dashmap",
+ "dashmap 6.0.1",
  "flate2",
  "futures 0.3.30",
  "glob",
@@ -3544,9 +3539,9 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3673,7 +3668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
 dependencies = [
  "cfg-if",
- "dashmap",
+ "dashmap 5.5.3",
  "futures 0.3.30",
  "futures-timer",
  "no-std-compat",
@@ -3725,7 +3720,7 @@ dependencies = [
  "graphql-parser",
  "heck 0.4.1",
  "lazy_static",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "serde",
  "serde_json",
@@ -3739,7 +3734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97"
 dependencies = [
  "graphql_client_codegen",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "syn 1.0.109",
 ]
 
@@ -3762,7 +3757,7 @@ name = "greptimedb-client"
 version = "0.1.0"
 source = "git+https://github.com/GreptimeTeam/greptimedb-ingester-rust.git?rev=d21dbcff680139ed2065b62100bac3123da7c789#d21dbcff680139ed2065b62100bac3123da7c789"
 dependencies = [
- "dashmap",
+ "dashmap 5.5.3",
  "enum_dispatch",
  "futures 0.3.30",
  "futures-util",
@@ -3805,7 +3800,7 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -3825,7 +3820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
  "atomic-waker",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -3898,7 +3893,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "headers-core",
  "http 0.2.9",
  "httpdate",
@@ -4006,7 +4001,7 @@ dependencies = [
  "log",
  "mach",
  "ntapi",
- "platforms 1.1.0",
+ "platforms",
  "winapi",
 ]
 
@@ -4053,9 +4048,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -4142,7 +4137,7 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fnv",
  "itoa",
 ]
@@ -4153,7 +4148,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fnv",
  "itoa",
 ]
@@ -4164,7 +4159,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 0.2.9",
  "pin-project-lite",
 ]
@@ -4175,7 +4170,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "http 1.1.0",
 ]
 
@@ -4185,7 +4180,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.0",
@@ -4218,7 +4213,6 @@ dependencies = [
  "async-channel",
  "base64 0.13.1",
  "futures-lite",
- "http 0.2.9",
  "infer 0.2.3",
  "pin-project-lite",
  "rand 0.7.3",
@@ -4253,7 +4247,7 @@ version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -4277,12 +4271,14 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-channel",
  "futures-util",
+ "h2 0.4.5",
  "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "smallvec",
@@ -4329,7 +4325,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures 0.3.30",
  "headers",
  "http 0.2.9",
@@ -4393,7 +4389,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "hyper 0.14.28",
  "native-tls",
  "tokio",
@@ -4406,7 +4402,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
@@ -4458,124 +4454,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -4623,18 +4501,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "idna"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -4689,6 +4555,19 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
 
+[[package]]
+name = "influxdb-line-protocol"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22fa7ee6be451ea0b1912b962c91c8380835e97cf1584a77e18264e908448dcb"
+dependencies = [
+ "bytes 1.6.1",
+ "log",
+ "nom",
+ "smallvec",
+ "snafu 0.7.5",
+]
+
 [[package]]
 name = "inotify"
 version = "0.9.6"
@@ -4910,7 +4789,7 @@ dependencies = [
 name = "k8s-e2e-tests"
 version = "0.1.0"
 dependencies = [
- "env_logger 0.11.3",
+ "env_logger 0.11.4",
  "futures 0.3.30",
  "indoc",
  "k8s-openapi 0.16.0",
@@ -4930,7 +4809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da"
 dependencies = [
  "base64 0.13.1",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "serde",
  "serde-value",
@@ -4944,7 +4823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "http 0.2.9",
  "percent-encoding",
@@ -5022,7 +4901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13"
 dependencies = [
  "base64 0.20.0",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "dirs-next",
  "either",
@@ -5122,9 +5001,9 @@ checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
 
 [[package]]
 name = "lapin"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fae02c316a8a5922ce7518afa6b6c00e9a099f8e59587567e3331efdd11b8ceb"
+checksum = "09373d2aa72b8026c24606543d395ba0b688152beb42537d8c10eca92e8c9925"
 dependencies = [
  "amq-protocol",
  "async-global-executor-trait",
@@ -5237,12 +5116,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "litemap"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
-
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -5261,9 +5134,9 @@ checksum = "3a69c0481fc2424cb55795de7da41add33372ea75a94f9b6588ab6a2826dfebc"
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "logfmt"
@@ -5275,7 +5148,7 @@ checksum = "879777f0cc6f3646a044de60e4ab98c75617e3f9580f7a2032e6ad7ea0cd3054"
 name = "loki-logproto"
 version = "0.1.0"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "prost 0.12.6",
  "prost-build 0.12.6",
@@ -5355,15 +5228,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mach2"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -5434,9 +5298,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -5476,32 +5340,21 @@ dependencies = [
 
 [[package]]
 name = "metrics"
-version = "0.21.1"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
+checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835"
 dependencies = [
  "ahash 0.8.11",
- "metrics-macros",
  "portable-atomic",
 ]
 
-[[package]]
-name = "metrics-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "metrics-tracing-context"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec95d1490f2b7e2d49462f9d75aa4fed52cc21e0b40aefc5987c6f404d40a2"
+checksum = "fb791d015f8947acf5a7f62bd28d00f289bb7ea98cfbe3ffec1d061eee12df12"
 dependencies = [
+ "indexmap 2.2.6",
  "itoa",
  "lockfree-object-pool",
  "metrics",
@@ -5514,19 +5367,19 @@ dependencies = [
 
 [[package]]
 name = "metrics-util"
-version = "0.15.1"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e"
+checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f"
 dependencies = [
  "aho-corasick",
  "crossbeam-epoch",
  "crossbeam-utils",
- "hashbrown 0.13.1",
- "indexmap 1.9.3",
+ "hashbrown 0.14.5",
+ "indexmap 2.2.6",
  "metrics",
  "num_cpus",
- "ordered-float 3.9.2",
- "quanta 0.11.1",
+ "ordered-float 4.2.1",
+ "quanta",
  "radix_trie",
  "sketches-ddsketch",
 ]
@@ -5574,11 +5427,23 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "mlua"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e340c022072f3208a4105458286f4985ba5355bfe243c3073afe45cbe9ecf491"
+checksum = "d111deb18a9c9bd33e1541309f4742523bfab01d276bfa9a27519f6de9c11dc7"
 dependencies = [
  "bstr 1.9.1",
  "mlua-sys",
@@ -5590,9 +5455,9 @@ dependencies = [
 
 [[package]]
 name = "mlua-sys"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5552e7e4e22ada0463dfdeee6caf6dc057a189fdc83136408a8f950a5e5c5540"
+checksum = "a088ed0723df7567f569ba018c5d48c23c501f3878b190b04144dfa5ebfa8abc"
 dependencies = [
  "cc",
  "cfg-if",
@@ -5610,10 +5475,10 @@ dependencies = [
  "itertools 0.12.1",
  "once_cell",
  "proc-macro-error",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "regex",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5637,7 +5502,7 @@ dependencies = [
  "futures-util",
  "once_cell",
  "parking_lot",
- "quanta 0.12.3",
+ "quanta",
  "rustc_version 0.4.0",
  "smallvec",
  "tagptr",
@@ -5699,7 +5564,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "encoding_rs",
  "futures-util",
  "http 1.1.0",
@@ -5839,9 +5704,9 @@ dependencies = [
 
 [[package]]
 name = "nkeys"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc522a19199a0795776406619aa6aa78e1e55690fbeb3181b8db5265fd0e89ce"
+checksum = "9d3669c39cc155872799f8b4f8cfec40fb85e2e099466a1ca110f70652ec0b51"
 dependencies = [
  "data-encoding",
  "ed25519",
@@ -5906,7 +5771,7 @@ dependencies = [
  "kqueue",
  "libc",
  "log",
- "mio",
+ "mio 0.8.11",
  "walkdir",
  "windows-sys 0.48.0",
 ]
@@ -5975,6 +5840,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-format"
 version = "0.4.4"
@@ -6072,7 +5943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -6084,9 +5955,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6096,9 +5967,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6160,7 +6031,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "serde",
  "smallvec",
 ]
@@ -6224,7 +6095,7 @@ dependencies = [
  "async-trait",
  "backon",
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "flagset",
  "futures 0.3.30",
@@ -6267,7 +6138,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_plain",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "sha2",
  "subtle",
  "thiserror",
@@ -6276,9 +6147,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.4.1",
  "cfg-if",
@@ -6295,9 +6166,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6317,9 +6188,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
@@ -6332,10 +6203,10 @@ dependencies = [
 name = "opentelemetry-proto"
 version = "0.1.0"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "hex",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "prost 0.12.6",
  "prost-build 0.12.6",
  "tonic 0.10.2",
@@ -6362,18 +6233,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "3.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-float"
-version = "4.2.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
+checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be"
 dependencies = [
  "num-traits",
 ]
@@ -6559,9 +6421,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.10"
+version = "2.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
 dependencies = [
  "memchr",
  "thiserror",
@@ -6586,9 +6448,9 @@ checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6674,9 +6536,9 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6747,12 +6609,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
 
-[[package]]
-name = "platforms"
-version = "3.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
-
 [[package]]
 name = "plotters"
 version = "0.3.5"
@@ -6850,13 +6706,13 @@ dependencies = [
 
 [[package]]
 name = "postgres-protocol"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520"
+checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "byteorder",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fallible-iterator",
  "hmac",
  "md-5",
@@ -6868,11 +6724,11 @@ dependencies = [
 
 [[package]]
 name = "postgres-types"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c"
+checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "fallible-iterator",
  "postgres-protocol",
@@ -6941,7 +6797,7 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "syn 1.0.109",
 ]
 
@@ -6951,8 +6807,8 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
- "proc-macro2 1.0.85",
- "syn 2.0.66",
+ "proc-macro2 1.0.86",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -7013,7 +6869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
  "version_check",
@@ -7025,7 +6881,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "version_check",
 ]
@@ -7053,9 +6909,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -7076,9 +6932,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -7100,7 +6956,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -7111,7 +6967,7 @@ version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "prost-derive 0.11.9",
 ]
 
@@ -7121,7 +6977,7 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "prost-derive 0.12.6",
 ]
 
@@ -7131,7 +6987,7 @@ version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "heck 0.4.1",
  "itertools 0.10.5",
  "lazy_static",
@@ -7153,7 +7009,7 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "heck 0.5.0",
  "itertools 0.12.1",
  "log",
@@ -7164,7 +7020,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-types 0.12.6",
  "regex",
- "syn 2.0.66",
+ "syn 2.0.72",
  "tempfile",
 ]
 
@@ -7176,7 +7032,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools 0.10.5",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -7189,9 +7045,9 @@ checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
  "itertools 0.12.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -7256,7 +7112,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -7279,7 +7135,7 @@ checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a"
 dependencies = [
  "async-trait",
  "bit-vec",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "crc",
  "data-url",
@@ -7316,22 +7172,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
 
-[[package]]
-name = "quanta"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "mach2",
- "once_cell",
- "raw-cpuid 10.7.0",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "quanta"
 version = "0.12.3"
@@ -7341,7 +7181,7 @@ dependencies = [
  "crossbeam-utils",
  "libc",
  "once_cell",
- "raw-cpuid 11.0.1",
+ "raw-cpuid",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "web-sys",
  "winapi",
@@ -7380,7 +7220,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -7400,7 +7240,7 @@ version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
 ]
 
 [[package]]
@@ -7517,33 +7357,25 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.26.3"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
+checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3"
 dependencies = [
  "bitflags 2.4.1",
  "cassowary",
  "compact_str",
  "crossterm",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "lru",
  "paste",
  "stability",
  "strum 0.26.2",
+ "strum_macros 0.26.4",
  "unicode-segmentation",
  "unicode-truncate",
  "unicode-width",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "10.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "raw-cpuid"
 version = "11.0.1"
@@ -7638,7 +7470,7 @@ checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd"
 dependencies = [
  "arc-swap",
  "async-trait",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "combine 4.6.6",
  "futures 0.3.30",
  "futures-util",
@@ -7770,7 +7602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -7816,7 +7648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
  "base64 0.22.1",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-core",
  "futures-util",
  "http 1.1.0",
@@ -7863,12 +7695,6 @@ dependencies = [
  "quick-error",
 ]
 
-[[package]]
-name = "retain_mut"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"
-
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -7901,7 +7727,7 @@ checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
 dependencies = [
  "bitvec",
  "bytecheck",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "hashbrown 0.12.3",
  "ptr_meta",
  "rend",
@@ -7917,7 +7743,7 @@ version = "0.7.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -7964,9 +7790,9 @@ dependencies = [
 
 [[package]]
 name = "roaring"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8"
+checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -8019,12 +7845,12 @@ dependencies = [
  "cfg-if",
  "glob",
  "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "regex",
  "relative-path",
  "rustc_version 0.4.0",
- "syn 2.0.66",
+ "syn 2.0.72",
  "unicode-ident",
 ]
 
@@ -8034,7 +7860,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1568e15fab2d546f940ed3a21f48bbbd1c494c90c99c4481339364a497f94a9"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "flume 0.11.0",
  "futures-util",
  "log",
@@ -8054,7 +7880,7 @@ checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4"
 dependencies = [
  "arrayvec",
  "borsh",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "num-traits",
  "rand 0.8.5",
  "rkyv",
@@ -8070,9 +7896,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
 
 [[package]]
 name = "rustc_version"
@@ -8419,9 +8245,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
@@ -8458,22 +8284,22 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8482,16 +8308,16 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "indexmap 2.2.6",
  "itoa",
@@ -8544,9 +8370,9 @@ version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8582,9 +8408,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -8594,7 +8420,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with_macros 3.8.1",
+ "serde_with_macros 3.9.0",
  "time",
 ]
 
@@ -8605,21 +8431,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling 0.13.4",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
 dependencies = [
  "darling 0.20.8",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8726,7 +8552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
@@ -8884,7 +8710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -8896,9 +8722,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8968,15 +8794,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a"
 dependencies = [
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -9057,7 +8877,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros 0.26.1",
+ "strum_macros 0.26.4",
 ]
 
 [[package]]
@@ -9067,23 +8887,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "rustversion",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.26.1"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.85",
+ "heck 0.5.0",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "rustversion",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -9119,18 +8939,18 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "unicode-ident",
 ]
@@ -9142,9 +8962,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -9153,17 +8973,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "syslog"
 version = "6.1.1"
@@ -9228,13 +9037,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tcp-stream"
-version = "0.26.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da30af7998f51ee1aa48ab24276fe303a697b004e31ff542b192c088d5630a5"
+checksum = "495b0abdce3dc1f8fd27240651c9e68890c14e9d9c61527b1ce44d8a5a7bd3d5"
 dependencies = [
  "cfg-if",
  "native-tls",
- "rustls-pemfile 1.0.3",
+ "rustls-pemfile 2.1.0",
 ]
 
 [[package]]
@@ -9305,22 +9114,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -9335,9 +9144,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemalloc-sys"
-version = "0.5.4+5.3.0-patched"
+version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1"
+checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
 dependencies = [
  "cc",
  "libc",
@@ -9345,9 +9154,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemallocator"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca"
+checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
 dependencies = [
  "libc",
  "tikv-jemalloc-sys",
@@ -9355,14 +9164,15 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
  "js-sys",
  "libc",
+ "num-conv",
  "num_threads",
  "powerfmt",
  "serde",
@@ -9378,10 +9188,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -9394,16 +9205,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -9431,22 +9232,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
 dependencies = [
  "backtrace",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "libc",
- "mio",
- "num_cpus",
+ "mio 1.0.1",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
  "tokio-macros",
  "tracing 0.1.40",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -9472,13 +9272,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -9505,13 +9305,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-postgres"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8"
+checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3"
 dependencies = [
  "async-trait",
  "byteorder",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "fallible-iterator",
  "futures-channel",
  "futures-util",
@@ -9580,7 +9380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
 dependencies = [
  "async-stream",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-core",
  "tokio",
  "tokio-stream",
@@ -9616,7 +9416,7 @@ name = "tokio-util"
 version = "0.7.8"
 source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.8-framed-read-continue-on-error#3747655f8f0443e13fe20da3f613ea65c23347c2"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-core",
  "futures-io",
  "futures-sink",
@@ -9628,14 +9428,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
@@ -9682,9 +9482,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.14"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
@@ -9703,7 +9503,7 @@ dependencies = [
  "async-trait",
  "axum",
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "flate2",
  "h2 0.3.26",
  "http 0.2.9",
@@ -9735,7 +9535,7 @@ dependencies = [
  "async-trait",
  "axum",
  "base64 0.21.7",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "h2 0.3.26",
  "http 0.2.9",
  "http-body 0.4.5",
@@ -9759,7 +9559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
 dependencies = [
  "prettyplease 0.1.25",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "prost-build 0.11.9",
  "quote 1.0.36",
  "syn 1.0.109",
@@ -9772,10 +9572,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
 dependencies = [
  "prettyplease 0.2.15",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "prost-build 0.12.6",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -9807,7 +9607,7 @@ dependencies = [
  "async-compression",
  "base64 0.21.7",
  "bitflags 2.4.1",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-core",
  "futures-util",
  "http 0.2.9",
@@ -9876,9 +9676,9 @@ version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -9936,7 +9736,7 @@ name = "tracing-limit"
 version = "0.1.0"
 dependencies = [
  "criterion",
- "dashmap",
+ "dashmap 6.0.1",
  "mock_instant",
  "tracing 0.1.40",
  "tracing-core 0.1.32",
@@ -10068,7 +9868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
 dependencies = [
  "byteorder",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "data-encoding",
  "http 0.2.9",
  "httparse",
@@ -10087,7 +9887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
 dependencies = [
  "byteorder",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "data-encoding",
  "http 1.1.0",
  "httparse",
@@ -10115,7 +9915,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "syn 1.0.109",
 ]
@@ -10135,9 +9935,9 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -10165,9 +9965,9 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -10253,9 +10053,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -10313,12 +10113,12 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna 1.0.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -10335,24 +10135,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
 
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -10361,11 +10149,10 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
- "atomic",
  "getrandom 0.2.15",
  "rand 0.8.5",
  "serde",
@@ -10418,7 +10205,7 @@ dependencies = [
 
 [[package]]
 name = "vector"
-version = "0.39.0"
+version = "0.40.0"
 dependencies = [
  "apache-avro",
  "approx",
@@ -10458,7 +10245,7 @@ dependencies = [
  "base64 0.22.1",
  "bloomy",
  "bollard",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "bytesize",
  "chrono",
  "chrono-tz",
@@ -10521,7 +10308,7 @@ dependencies = [
  "mlua",
  "mongodb",
  "nix 0.26.2",
- "nkeys 0.4.1",
+ "nkeys 0.4.2",
  "nom",
  "notify",
  "num-format",
@@ -10531,7 +10318,7 @@ dependencies = [
  "openssl",
  "openssl-probe",
  "openssl-src",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "paste",
  "percent-encoding",
  "pin-project",
@@ -10563,7 +10350,7 @@ dependencies = [
  "serde-toml-merge",
  "serde_bytes",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "serde_yaml 0.9.34+deprecated",
  "similar-asserts",
  "smallvec",
@@ -10636,7 +10423,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "bytecheck",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "clap",
  "crc32fast",
  "criterion",
@@ -10679,7 +10466,7 @@ name = "vector-common"
 version = "0.1.0"
 dependencies = [
  "async-stream",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "chrono-tz",
  "crossbeam-utils",
@@ -10688,7 +10475,7 @@ dependencies = [
  "indexmap 2.2.6",
  "metrics",
  "nom",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "paste",
  "pin-project",
  "quickcheck",
@@ -10722,7 +10509,7 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "snafu 0.7.5",
  "toml",
  "tracing 0.1.40",
@@ -10740,11 +10527,11 @@ dependencies = [
  "convert_case 0.6.0",
  "darling 0.20.8",
  "once_cell",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "serde",
  "serde_json",
- "syn 2.0.66",
+ "syn 2.0.72",
  "tracing 0.1.40",
 ]
 
@@ -10753,11 +10540,11 @@ name = "vector-config-macros"
 version = "0.1.0"
 dependencies = [
  "darling 0.20.8",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
  "serde",
  "serde_derive_internals",
- "syn 2.0.66",
+ "syn 2.0.72",
  "vector-config",
  "vector-config-common",
 ]
@@ -10770,7 +10557,7 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "bitmask-enum",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "chrono",
  "chrono-tz",
  "criterion",
@@ -10798,14 +10585,14 @@ dependencies = [
  "noisy_float",
  "once_cell",
  "openssl",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "parking_lot",
  "pin-project",
  "proptest",
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-types 0.12.6",
- "quanta 0.12.3",
+ "quanta",
  "quickcheck",
  "quickcheck_macros",
  "rand 0.8.5",
@@ -10816,7 +10603,7 @@ dependencies = [
  "security-framework",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "serde_yaml 0.9.34+deprecated",
  "similar-asserts",
  "smallvec",
@@ -10834,6 +10621,7 @@ dependencies = [
  "tracing-subscriber",
  "typetag",
  "url",
+ "urlencoding",
  "vector-buffers",
  "vector-common",
  "vector-config",
@@ -10859,6 +10647,7 @@ dependencies = [
  "vector-core",
  "vector-lookup",
  "vector-stream",
+ "vector-tap",
 ]
 
 [[package]]
@@ -10893,6 +10682,25 @@ dependencies = [
  "vector-core",
 ]
 
+[[package]]
+name = "vector-tap"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "colored",
+ "futures-util",
+ "portpicker",
+ "serde_json",
+ "serde_yaml 0.9.34+deprecated",
+ "snafu 0.7.5",
+ "tokio",
+ "tokio-stream",
+ "tokio-tungstenite 0.20.1",
+ "tracing 0.1.40",
+ "url",
+ "vector-api-client",
+]
+
 [[package]]
 name = "vector-vrl-cli"
 version = "0.1.0"
@@ -10958,9 +10766,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "vrl"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a714e10e3f6bac2ef76935b9281cc7434cc6f85f6ddab644383454555b63346"
+checksum = "84451e6a979d54175932cfe49f36f31ab7a483f3feb3cfa65ee584b91ef2f858"
 dependencies = [
  "aes",
  "ansi_term",
@@ -10968,7 +10776,7 @@ dependencies = [
  "base16",
  "base62",
  "base64 0.22.1",
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "cbc",
  "cfb-mode",
  "cfg-if",
@@ -11007,7 +10815,7 @@ dependencies = [
  "ofb",
  "once_cell",
  "onig",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "paste",
  "peeking_take_while",
  "percent-encoding",
@@ -11039,6 +10847,7 @@ dependencies = [
  "syslog_loose",
  "termcolor",
  "thiserror",
+ "tokio",
  "tracing 0.1.40",
  "uaparser",
  "url",
@@ -11071,7 +10880,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
 ]
 
@@ -11115,7 +10924,7 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c"
 dependencies = [
- "bytes 1.6.0",
+ "bytes 1.6.1",
  "futures-channel",
  "futures-util",
  "headers",
@@ -11174,9 +10983,9 @@ dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
@@ -11208,9 +11017,9 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -11623,24 +11432,26 @@ dependencies = [
 
 [[package]]
 name = "wiremock"
-version = "0.5.22"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9"
+checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717"
 dependencies = [
  "assert-json-diff",
  "async-trait",
  "base64 0.21.7",
  "deadpool",
  "futures 0.3.30",
- "futures-timer",
- "http-types",
- "hyper 0.14.28",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.2.0",
+ "hyper-util",
  "log",
  "once_cell",
  "regex",
  "serde",
  "serde_json",
  "tokio",
+ "url",
 ]
 
 [[package]]
@@ -11653,18 +11464,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -11689,30 +11488,6 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.31"
@@ -11728,30 +11503,9 @@ version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
- "proc-macro2 1.0.85",
+ "proc-macro2 1.0.86",
  "quote 1.0.36",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
- "synstructure",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -11760,28 +11514,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 
-[[package]]
-name = "zerovec"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
-dependencies = [
- "proc-macro2 1.0.85",
- "quote 1.0.36",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "zstd"
 version = "0.12.4"
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 9ed2bc9c6e2ed..129afebe34489 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -36,7 +36,7 @@
 
 let
   pname = "vector";
-  version = "0.39.0";
+  version = "0.40.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage {
     owner = "vectordotdev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-S6yzh8ISIh6xzw5DwQaoZdpfmDHE9gfjlEtxIZerSak=";
+    hash = "sha256-KJqixwOc9M8xBzeyJFF3sFfybqAroEYu4OPD8q+PMRY=";
   };
 
   cargoLock = {
diff --git a/pkgs/tools/misc/xmlbeans/default.nix b/pkgs/tools/misc/xmlbeans/default.nix
index f3702d0302c52..040205753c059 100644
--- a/pkgs/tools/misc/xmlbeans/default.nix
+++ b/pkgs/tools/misc/xmlbeans/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://xmlbeans.apache.org/";
     downloadPage = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix
index c1ef7ae81b19b..3973f8d096ac9 100644
--- a/pkgs/tools/misc/xxv/default.nix
+++ b/pkgs/tools/misc/xxv/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage    = "https://chrisvest.github.io/xxv/";
     license     = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "xxv";
   };
 }
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index f095a4260b89b..7ff660e8247ce 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/skywind3000/z.lua";
     description = "New cd command that helps you navigate faster by learning your habits";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "z.lua";
   };
 }
diff --git a/pkgs/tools/misc/zitadel-tools/default.nix b/pkgs/tools/misc/zitadel-tools/default.nix
index 0ef9b344320d0..83d4cc147205d 100644
--- a/pkgs/tools/misc/zitadel-tools/default.nix
+++ b/pkgs/tools/misc/zitadel-tools/default.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     description = "Helper tools for zitadel";
     homepage = "https://github.com/zitadel/zitadel-tools";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "zitadel-tools";
   };
 }
diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/tools/networking/airgeddon/default.nix
index 2bfe38203e8ad..a79cf2f70abd9 100644
--- a/pkgs/tools/networking/airgeddon/default.nix
+++ b/pkgs/tools/networking/airgeddon/default.nix
@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon";
     changelog = "https://github.com/v1s1t0r1sh3r3/airgeddon/blob/v${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index c9d2f4bbd62df..ce8265520da5e 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Udev helper for naming devices per BIOS names";
     license = licenses.gpl2Only;
     platforms = ["x86_64-linux" "i686-linux"];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "biosdevname";
   };
 }
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix
index d10ecadc4e3ba..e6e1907a25d8b 100644
--- a/pkgs/tools/networking/bwm-ng/default.nix
+++ b/pkgs/tools/networking/bwm-ng/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     longDescription = ''
       bwm-ng supports:
        - /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit,
diff --git a/pkgs/tools/networking/castnow/default.nix b/pkgs/tools/networking/castnow/default.nix
index 095a2e8541a66..1c00ab22c0280 100644
--- a/pkgs/tools/networking/castnow/default.nix
+++ b/pkgs/tools/networking/castnow/default.nix
@@ -22,7 +22,7 @@ buildNpmPackage rec {
     description = "Command-line Chromecast player";
     homepage = "https://github.com/xat/castnow";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "castnow";
   };
 }
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 7fe184b1ef39b..aae8f227ddeb7 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://zakalwe.fi/~shd/foss/cksfv/";
     description = "Tool for verifying files against a SFV checksum file";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     license = licenses.gpl2Plus;
     mainProgram = "cksfv";
diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/tools/networking/cnping/default.nix
index ba22730a3ea09..02273d1436ebe 100644
--- a/pkgs/tools/networking/cnping/default.nix
+++ b/pkgs/tools/networking/cnping/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Minimal Graphical IPV4 Ping Tool";
     homepage = "https://github.com/cntools/cnping";
     license = with licenses; [ mit bsd3 ]; # dual licensed, MIT-x11 & BSD-3-Clause
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "cnping";
   };
diff --git a/pkgs/tools/networking/decode-spam-headers/default.nix b/pkgs/tools/networking/decode-spam-headers/default.nix
index 738a6f8314746..2ccab2956aed8 100644
--- a/pkgs/tools/networking/decode-spam-headers/default.nix
+++ b/pkgs/tools/networking/decode-spam-headers/default.nix
@@ -54,6 +54,6 @@ python3Packages.buildPythonApplication rec {
       have been blocked.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix
index c4e5fc18e6e6f..30017b2b76203 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/pkgs/tools/networking/dnstracer/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data";
     homepage = "http://www.mavetju.org/unix/general.php";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "dnstracer";
   };
diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix
index 57d5f1136a3aa..661bfd8e2664a 100644
--- a/pkgs/tools/networking/freebind/default.nix
+++ b/pkgs/tools/networking/freebind/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/blechschmidt/freebind";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
index 8f703320f253b..5d50f56604850 100644
--- a/pkgs/tools/networking/gandi-cli/default.nix
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -34,6 +34,6 @@ buildPythonApplication rec {
     mainProgram = "gandi";
     homepage = "https://cli.gandi.net/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix
index bc5f17a2420ef..90cda6d78a400 100644
--- a/pkgs/tools/networking/httperf/default.nix
+++ b/pkgs/tools/networking/httperf/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Httperf HTTP load generator";
     homepage = "https://github.com/httperf/httperf";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     mainProgram = "httperf";
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 68e1483e7a923..fa064fbd1664c 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://troglobit.com/projects/inadyn/";
     description = "Free dynamic DNS client";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "inadyn";
   };
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index c30c19b49b730..3c252de4feee4 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.deepspace6.net/projects/ipv6calc.html";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/tools/networking/labctl/default.nix
index 71593411e8974..89c84e4f1832e 100644
--- a/pkgs/tools/networking/labctl/default.nix
+++ b/pkgs/tools/networking/labctl/default.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     description = "collection of helper tools for network engineers, while configuring and experimenting with their own network labs";
     homepage = "https://labctl.net";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "labctl";
   };
 }
diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix
index 474fa046bffe5..b156b4f125f32 100644
--- a/pkgs/tools/networking/mmsd/default.nix
+++ b/pkgs/tools/networking/mmsd/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Multimedia Messaging Service Daemon";
     homepage = "https://01.org/ofono";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index b54c07eae9afb..f58851df6a4b5 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "mu";
-  version = "1.12.5";
+  version = "1.12.6";
 
   outputs = [ "out" "mu4e" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "djcb";
     repo = "mu";
     rev = "v${version}";
-    hash = "sha256-dQeXL+CcysmlV6VYSuZtWGSgIhoqP6Y20Qora4l0iP8=";
+    hash = "sha256-/aWKhqDWkdOGuLViBkzqQ3WdULaEdcPnWTSthQZ8j4s=";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix
index 9d58389bae571..e7234cc172fff 100644
--- a/pkgs/tools/networking/networkmanager/applet/default.nix
+++ b/pkgs/tools/networking/networkmanager/applet/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/";
     description = "NetworkManager control applet for GNOME";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "nm-applet";
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix
index 6ed2055d54544..8e39737532d2a 100644
--- a/pkgs/tools/networking/nexttrace/default.nix
+++ b/pkgs/tools/networking/nexttrace/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "nexttrace";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
     rev = "v${version}";
-    sha256 = "sha256-mJkAV4eUecJv2H3smfTNPcj+liCH8wNl/wiO+Q92eDE=";
+    sha256 = "sha256-Hws8bq2NVBBS3ngzCT5mPNThHDOK5waX4TxK4zlsNC0=";
   };
-  vendorHash = "sha256-immUT11gO3dFkrwrjwwYtPLxhYvSKcxmwaEkjFGrMsE=";
+  vendorHash = "sha256-DHGPWHOEobBqb2QpUh7WAEViOQKQ8+8PDLPBi812H+k=";
 
   doCheck = false; # Tests require a network connection.
 
diff --git a/pkgs/tools/networking/ntttcp/default.nix b/pkgs/tools/networking/ntttcp/default.nix
index 5246d2cc495f3..abf0acf8a8938 100644
--- a/pkgs/tools/networking/ntttcp/default.nix
+++ b/pkgs/tools/networking/ntttcp/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Linux network throughput multiple-thread benchmark tool";
     homepage = "https://github.com/microsoft/ntttcp-for-linux";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "ntttcp";
   };
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix
index 467159e8c2750..7bee729c4ed96 100644
--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/pkgs/tools/networking/nuttcp/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2Only;
     homepage = "http://nuttcp.net/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "nuttcp";
   };
diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix
index 6b354f3b33986..f298e7f4f75e4 100644
--- a/pkgs/tools/networking/octodns/default.nix
+++ b/pkgs/tools/networking/octodns/default.nix
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/octodns/octodns";
     changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix
index 18cd54f0f0815..dfecb36a62787 100644
--- a/pkgs/tools/networking/octodns/providers/bind/default.nix
+++ b/pkgs/tools/networking/octodns/providers/bind/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/octodns/octodns-bind";
     changelog = "https://github.com/octodns/octodns-bind/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/pkgs/tools/networking/octodns/providers/hetzner/default.nix
index 688f1c90e2b84..830678391d707 100644
--- a/pkgs/tools/networking/octodns/providers/hetzner/default.nix
+++ b/pkgs/tools/networking/octodns/providers/hetzner/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/octodns/octodns-hetzner/";
     changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix
index 25d5291a55946..d1c39b628da1e 100644
--- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix
+++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/octodns/octodns-powerdns/";
     changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 9ddc2164b456c..b3743e74fe40a 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
     homepage = "http://offlineimap.org";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "offlineimap";
   };
 }
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index e87f8a707361d..c7aa844b7baa3 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     homepage = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";
     changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${version}";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "ofonod";
   };
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 6d4950b40fca3..d5446fedb5503 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://github.com/amule-project/amule";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
     # Undefined symbols for architecture arm64: "_FSFindFolder"
     broken = stdenv.isDarwin;
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix
index acd0d1c8171df..5a60e145aeda7 100644
--- a/pkgs/tools/networking/photon/default.nix
+++ b/pkgs/tools/networking/photon/default.nix
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
     description = "Lightning fast web crawler which extracts URLs, files, intel & endpoints from a target";
     homepage = "https://github.com/s0md3v/Photon";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "photon";
   };
 }
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix
index 87ea83f5a467d..e92401c90f6d6 100644
--- a/pkgs/tools/networking/redir/default.nix
+++ b/pkgs/tools/networking/redir/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "TCP port redirector for UNIX";
     homepage = "https://github.com/troglobit/redir";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "redir";
   };
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 72745114a26e9..e6ae2fa0f5234 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "SSTP client for Linux";
     homepage = "https://sstp-client.sourceforge.net/";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.gpl2Plus;
     mainProgram = "sstpc";
   };
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index d4308b6037893..a42d6773fc83f 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Featureful, flexible, scriptable, transaction-oriented SMTP test tool";
     mainProgram = "swaks";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 
diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix
index 896fbfc749bd7..68e7e31af3166 100644
--- a/pkgs/tools/networking/tinyfecvpn/default.nix
+++ b/pkgs/tools/networking/tinyfecvpn/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "VPN Designed for Lossy Links, with Build-in Forward Error Correction(FEC) Support";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "tinyvpn";
   };
 }
diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix
index 35b1f473cb2d9..4e76a5194107d 100644
--- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix
+++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix
@@ -9,10 +9,10 @@
 }:
 mkDerivation {
   pname = "nix-output-monitor";
-  version = "2.1.2";
+  version = "2.1.3";
   src = fetchzip {
-    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.2.tar.gz";
-    sha256 = "192h67myibpc2bw5ng60qi4m9jyjd9cf14aba4ps44ayjw95wkc0";
+    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.3.tar.gz";
+    sha256 = "1xm40pp9lqj2hlwk3ds9zyjd4yqsis2a2ac5kn19z60glxvaijvx";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/tools/nix/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix
index 8c8b26e9ad475..b01ee138170f9 100644
--- a/pkgs/tools/nix/nixos-option/default.nix
+++ b/pkgs/tools/nix/nixos-option/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     license = licenses.lgpl2Plus;
     mainProgram = "nixos-option";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     inherit (nix.meta) platforms;
   };
 }
diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix
index 41444e8533d56..cef9c6c5fb175 100644
--- a/pkgs/tools/package-management/holo-build/default.nix
+++ b/pkgs/tools/package-management/holo-build/default.nix
@@ -54,7 +54,7 @@ buildGoModule rec {
     description = "Cross-distribution system package compiler";
     homepage = "https://holocm.org/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "holo-build";
   };
 }
diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix
index 59704a0a68363..53b05bccf3498 100644
--- a/pkgs/tools/package-management/nix-doc/default.nix
+++ b/pkgs/tools/package-management/nix-doc/default.nix
@@ -35,13 +35,11 @@ rustPlatform.buildRustPackage rec {
   # the wrong Nix version (disabling bindnow permits loading libraries
   # requiring unavailable symbols if they are unreached)
   hardeningDisable = lib.optionals withPlugin [ "bindnow" ];
-  # Due to a Rust bug, setting -Z relro-level to anything including "off" on
+
+  # Due to a Rust bug, setting -C relro-level to anything including "off" on
   # macOS will cause link errors
   env = lib.optionalAttrs (withPlugin && stdenv.isLinux) {
-    # nix-doc does not use nightly features, however, there is no other way to
-    # set relro-level
-    RUSTC_BOOTSTRAP = 1;
-    RUSTFLAGS = "-Z relro-level=partial";
+    RUSTFLAGS = "-C relro-level=partial";
   };
 
   cargoHash = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw=";
@@ -51,7 +49,7 @@ rustPlatform.buildRustPackage rec {
     longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script";
     homepage = "https://github.com/lf-/nix-doc";
     license = licenses.lgpl3Plus;
-    maintainers = [ ];
+    maintainers = [ maintainers.philiptaron ];
     platforms = platforms.unix;
     mainProgram = "nix-doc";
   };
diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix
index 55adc54152450..60f08b8db6bc0 100644
--- a/pkgs/tools/package-management/nix-template/default.nix
+++ b/pkgs/tools/package-management/nix-template/default.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jonringer/nix-template/";
     changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}";
     license = licenses.cc0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "nix-template";
   };
 }
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
index 08b94a0fd227f..aa365ebb36b34 100644
--- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
+++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Poetry plugin to export the dependencies to various formats";
     license = licenses.mit;
     homepage = "https://github.com/python-poetry/poetry-plugin-export";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix
index dea5c14fc3bce..74a0c39cb2d7a 100644
--- a/pkgs/tools/security/acsccid/default.nix
+++ b/pkgs/tools/security/acsccid/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = src.meta.homepage;
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix
index a0cbd7da0f961..a2b5d31c85388 100644
--- a/pkgs/tools/security/aide/default.nix
+++ b/pkgs/tools/security/aide/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     "--with-posix-acl"
     "--with-selinux"
     "--with-xattr"
+    "--sysconfdir=/etc"
     ];
 
   meta = with lib; {
diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix
index e9a4680a0b241..321ab52ccef9a 100644
--- a/pkgs/tools/security/arti/default.nix
+++ b/pkgs/tools/security/arti/default.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://arti.torproject.org/";
     changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/${src.rev}/CHANGELOG.md";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix
index 74f49fbab41e7..f954f666def13 100644
--- a/pkgs/tools/security/brutespray/default.nix
+++ b/pkgs/tools/security/brutespray/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
       directly from Nmap output.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
index 5761763553927..2537d1ecbbfec 100644
--- a/pkgs/tools/security/certstrap/default.nix
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -30,6 +30,6 @@ buildGoModule rec {
     homepage = "https://github.com/square/certstrap";
     changelog = "https://github.com/square/certstrap/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix
index 0a43260eb8315..69ce4aa511b69 100644
--- a/pkgs/tools/security/ecdsautils/default.nix
+++ b/pkgs/tools/security/ecdsautils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";
     homepage = "https://github.com/freifunk-gluon/ecdsautils/";
     license = with licenses; [ mit bsd2 ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index 86bc4293747c7..139f8fa18b59d 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
   meta = with lib; {
     homepage = "https://github.com/AdRoll/hologram/";
     description = "Easy, painless AWS credentials on developer laptops";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.asl20;
   };
 }
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index c20157cb41949..9da88fc622549 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/lastpass/lastpass-cli";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix
index b33f36bd30f67..63e56bb5a9071 100644
--- a/pkgs/tools/security/medusa/default.nix
+++ b/pkgs/tools/security/medusa/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     description = "Speedy, parallel, and modular, login brute-forcer";
     mainProgram = "medusa";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix
index ccd510f63af20..4076205815392 100644
--- a/pkgs/tools/security/metasploit/shell.nix
+++ b/pkgs/tools/security/metasploit/shell.nix
@@ -1,9 +1,11 @@
 # Env to update Gemfile.lock / gemset.nix
-with import <nixpkgs> {};
-stdenv.mkDerivation {
+{
+  pkgs ? import ../../../.. { },
+}:
+pkgs.stdenv.mkDerivation {
   name = "env";
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
+  nativeBuildInputs = [ pkgs.pkg-config ];
+  buildInputs = with pkgs; [
     bundix
     git
     libiconv
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix
index d6ee40e6f5eab..53b0e38a0dca4 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/pkgs/tools/security/mkp224o/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     homepage = "http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/";
     license = licenses.cc0;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix
index 791bf7cf30a81..c675bcc9824fc 100644
--- a/pkgs/tools/security/nitrokey-app2/default.nix
+++ b/pkgs/tools/security/nitrokey-app2/default.nix
@@ -9,7 +9,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nitrokey-app2";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = python3.pythonOlder "3.9";
@@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app2";
-    rev = "v${version}";
-    hash = "sha256-BSq3ezNt6btQUO1hMVw9bN3VCyUOUhfRFJcHDGkIm6Q=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-A/HGMFgYaxgJApR3LQfFuBD5B0A3GGBeoTT5brp/UAs=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 4e2ad4b53c9a0..e204c14a234e5 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -88,6 +88,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/carnager/rofi-pass";
     license = lib.licenses.gpl3;
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix
index 3ec277ce273af..d5cf2f8267e2b 100644
--- a/pkgs/tools/security/passff-host/default.nix
+++ b/pkgs/tools/security/passff-host/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "Host app for the WebExtension PassFF";
     homepage = "https://github.com/passff/passff-host";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix
index 335d9c5c18a54..193a5433b598f 100644
--- a/pkgs/tools/security/secp256k1/default.nix
+++ b/pkgs/tools/security/secp256k1/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/bitcoin-core/secp256k1";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = with platforms; all;
   };
 }
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix
index 7d879aa497de9..842eb342c25fb 100644
--- a/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/pkgs/tools/security/simple-tpm-pk11/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage    = "https://github.com/ThomasHabets/simple-tpm-pk11";
     license     = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/tools/security/snallygaster/default.nix
index 2f9ad98743cb6..9045f82a42171 100644
--- a/pkgs/tools/security/snallygaster/default.nix
+++ b/pkgs/tools/security/snallygaster/default.nix
@@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "snallygaster";
     homepage = "https://github.com/hannob/snallygaster";
     license = licenses.cc0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index 61d10111120ed..9d7b1a894b5b5 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "http://point-at-infinity.org/ssss/";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix
index 03cf76b5385a5..392f955fe7656 100644
--- a/pkgs/tools/system/cm-rgb/default.nix
+++ b/pkgs/tools/system/cm-rgb/default.nix
@@ -54,6 +54,6 @@ buildPythonApplication rec {
     homepage = "https://github.com/gfduszynski/cm-rgb";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index c00df8611ea1a..18a4f88bf56a5 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
     changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "inxi";
   };
 }
diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix
index 483ea356f0e98..c16d1e738226f 100644
--- a/pkgs/tools/system/jump/default.nix
+++ b/pkgs/tools/system/jump/default.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
     '';
     homepage = "https://github.com/gsamokovarov/jump";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "jump";
   };
 }
diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix
index ed4d09454d566..613976bcbd9ea 100644
--- a/pkgs/tools/system/natscli/default.nix
+++ b/pkgs/tools/system/natscli/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "natscli";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "natscli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-c2bFFbHKjKwkzX2Br1CC2aMh1Tz0NPVWCfPSFbu/XnU=";
+    hash = "sha256-hLjiY4+01t1ZlP+N8qBG0YiDiw6VdTdeNkrwHwthrjk=";
   };
 
-  vendorHash = "sha256-ltTQWAS6OG485oj6GEpgQnnuCUunSqUtgq1/OPcjKmQ=";
+  vendorHash = "sha256-T6VcyklwfRS012ZRzqxkahn9YYrQGky/znTqLIkAoK0=";
 
   meta = with lib; {
     description = "NATS Command Line Interface";
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
index 46db1c612ff39..967547e2d85d4 100644
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/chneukirchen/nq";
     license = licenses.publicDomain;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
index 6cd1f6858e05b..3d0fa0d62ac27 100644
--- a/pkgs/tools/system/psensor/default.nix
+++ b/pkgs/tools/system/psensor/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wpitchoune.net/psensor/";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "psensor";
   };
 }
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index d1dcca9159eb3..8479e6840a53b 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -189,6 +189,6 @@ stdenv.mkDerivation rec {
     changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index 076cd1c020a76..1aa4c5ea1a2d7 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/erpalma/throttled";
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix
index 43d7480fc7572..353cec91be98c 100644
--- a/pkgs/tools/system/uefitool/common.nix
+++ b/pkgs/tools/system/uefitool/common.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
     description = "UEFI firmware image viewer and editor";
     homepage = "https://github.com/LongSoft/uefitool";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 93dcca90a264d..26e536618d6ea 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/rpodgorny/uptimed/";
     license = with licenses; [ gpl2Only lgpl21Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 6e5be5db44f9d..e790048ebcb5e 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     description = "Chrome OS partitioning and kernel signing tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index 2a8231b7fb039..2d8fb2e98aea4 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/chneukirchen/xe";
     license = licenses.publicDomain;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "xe";
   };
 }
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index 38d1ba5e06e4b..1fdaf78a6769d 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "MS-Word/Excel/PowerPoint to text converter";
     platforms = platforms.all;
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index 1ab884b12d4db..0b35b5779a3b5 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
   meta = with lib; {
     homepage = "https://www.jefftk.com/icdiff";
     description = "Side-by-side highlighted command line diffs";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     license = licenses.psfl;
   };
 }
diff --git a/pkgs/tools/text/markdownlint-cli2/default.nix b/pkgs/tools/text/markdownlint-cli2/default.nix
index 90a4b871cbc19..d98d3a9f29c6d 100644
--- a/pkgs/tools/text/markdownlint-cli2/default.nix
+++ b/pkgs/tools/text/markdownlint-cli2/default.nix
@@ -52,5 +52,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/DavidAnson/markdownlint-cli2";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
+    mainProgram = "markdownlint-cli2";
   };
 })
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 317d29003cd31..f12c0fdea5e80 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.nongnu.org/numdiff/";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/paperoni/default.nix b/pkgs/tools/text/paperoni/default.nix
index 1ceb29f1265a6..5378598da7dff 100644
--- a/pkgs/tools/text/paperoni/default.nix
+++ b/pkgs/tools/text/paperoni/default.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/hipstermojo/paperoni";
     changelog = "https://github.com/hipstermojo/paperoni/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
index a744300bfddec..f455d0f97c658 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     license = "custom";
     homepage = "http://www.jclark.com/jade/";
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix
index a51bd79251646..a3915a2d664ff 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/pkgs/tools/text/sgml/opensp/default.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = "https://openjade.sourceforge.net/";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/text/write-good/default.nix b/pkgs/tools/text/write-good/default.nix
index db3e16c23debd..99105ce649d5d 100644
--- a/pkgs/tools/text/write-good/default.nix
+++ b/pkgs/tools/text/write-good/default.nix
@@ -23,6 +23,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/btford/write-good";
     license = lib.licenses.mit;
     mainProgram = "write-good";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index 63b6e406ae098..f47c9dac0f10b 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://michaelrsweet.github.io/htmldoc";
     changelog   = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}";
     license     = licenses.gpl2Only;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
index 750ed6396d1b4..90949bb96878f 100644
--- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
@@ -28,7 +28,7 @@ let
       description = "Kramdown extension for converting Markdown documents to AsciiDoc";
       homepage = "https://asciidoctor.org/";
       license = licenses.mit;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
       platforms = platforms.unix;
       mainProgram = "kramdoc";
     };
diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix
index 292f571611ded..2876e9aa18426 100644
--- a/pkgs/tools/video/gopro/default.nix
+++ b/pkgs/tools/video/gopro/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/KonradIT/gopro-linux";
     platforms = platforms.unix;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "gopro";
   };
 }
diff --git a/pkgs/tools/video/rwedid/default.nix b/pkgs/tools/video/rwedid/default.nix
index eea8a86c8cc3b..3b7870fdc9b35 100644
--- a/pkgs/tools/video/rwedid/default.nix
+++ b/pkgs/tools/video/rwedid/default.nix
@@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://codeberg.org/ral/rwedid";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix
index 39e085931ddae..ff6a56a670c25 100644
--- a/pkgs/tools/video/yaydl/default.nix
+++ b/pkgs/tools/video/yaydl/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://code.rosaelefanten.org/yaydl";
     description = "Yet another youtube down loader";
     license = licenses.cddl;
-    maintainers = with maintainers; [];
+    maintainers = [ ];
     mainProgram = "yaydl";
   };
 }
diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index 6a94e251a788c..fab60f9832b73 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     description = "Extra tools for accessing and modifying virtual machine disk images";
     license = with licenses; [ gpl2Plus lgpl21Plus ];
     homepage = "https://libguestfs.org/";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/tools/virtualization/onmetal-image/default.nix
index 2b535dfb6d938..3780bc398b07d 100644
--- a/pkgs/tools/virtualization/onmetal-image/default.nix
+++ b/pkgs/tools/virtualization/onmetal-image/default.nix
@@ -34,7 +34,7 @@ buildGoModule rec {
     description = "Onmetal OCI Image Specification, Library and Tooling";
     homepage = "https://github.com/onmetal/onmetal-image";
     license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "onmetal-image";
   };
 }
diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix
index 9d954d9ed03d8..e2e00c513eaac 100644
--- a/pkgs/tools/virtualization/uefi-run/default.nix
+++ b/pkgs/tools/virtualization/uefi-run/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     description = "Directly run UEFI applications in qemu";
     homepage = "https://github.com/Richard-W/uefi-run";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "uefi-run";
   };
 }
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index e1b89a562a8f1..9ed390bc44489 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -44,7 +44,7 @@ buildGoModule rec {
     description = "XenServer guest utilities";
     homepage = "https://github.com/xenserver/xe-guest-utilities";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix
index 40e6e5939c780..27b7b55ba14fd 100644
--- a/pkgs/tools/wayland/sirula/default.nix
+++ b/pkgs/tools/wayland/sirula/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple app launcher for wayland written in rust";
     homepage = "https://github.com/DorianRudolph/sirula";
     license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c10305494b1d5..a97ab1c0c9492 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -184,6 +184,7 @@ mapAliases ({
   bpftool = bpftools; # Added 2021-05-03
   bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16
   bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10
+  bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
 
   budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
   budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
@@ -325,6 +326,7 @@ mapAliases ({
   dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
   dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
   dnnl = oneDNN; # Added 2020-04-22
+  docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
   docker-distribution = distribution; # Added 2023-12-26
   docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27
   docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27
@@ -1520,6 +1522,7 @@ mapAliases ({
   wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10
   wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10
   wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
+  wpa_supplicant_ro_ssids = lib.trivial.warn "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
   wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   wmii_hg = wmii;
   wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f489cfc5aae6..cc9e1a55b1ab4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2555,6 +2555,24 @@ with pkgs;
       pkgsCross.gnu64.hello;
   };
 
+  box86 =
+    let
+      args = {
+        hello-x86_32 = if stdenv.hostPlatform.isx86_32 then
+          hello
+        else
+          pkgsCross.gnu32.hello;
+      };
+    in
+    if stdenv.hostPlatform.is32bit then
+      callPackage ../applications/emulators/box86 args
+    else if stdenv.hostPlatform.isx86_64 then
+      pkgsCross.gnu32.callPackage ../applications/emulators/box86 args
+    else if stdenv.hostPlatform.isAarch64 then
+      pkgsCross.armv7l-hf-multiplatform.callPackage ../applications/emulators/box86 args
+    else
+      throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
+
   caprice32 = callPackage ../applications/emulators/caprice32 { };
 
   ccemux = callPackage ../applications/emulators/ccemux { };
@@ -4360,8 +4378,6 @@ with pkgs;
 
   burpsuite = callPackage ../tools/networking/burpsuite { };
 
-  bs-platform = callPackage ../development/compilers/bs-platform { };
-
   ciano = callPackage ../applications/graphics/ciano {
     inherit (pantheon) granite;
     python = python3;
@@ -4544,7 +4560,7 @@ with pkgs;
 
   comma = callPackage ../tools/package-management/comma { };
 
-  commitizen = callPackage ../applications/version-management/commitizen { };
+  commitizen = with python3Packages; toPythonApplication commitizen;
 
   common-licenses = callPackage ../data/misc/common-licenses { };
 
@@ -6413,10 +6429,6 @@ with pkgs;
 
   boltbrowser = callPackage ../tools/misc/boltbrowser { };
 
-  bsc = callPackage ../tools/compression/bsc {
-    inherit (llvmPackages) openmp;
-  };
-
   bzip2 = callPackage ../tools/compression/bzip2 { };
 
   bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };
@@ -15978,7 +15990,7 @@ with pkgs;
     # assumption is that or any later version is good.
     choose = platform:
       /**/ if platform.isDarwin then 16
-      else if platform.isFreeBSD then 16
+      else if platform.isFreeBSD then 18
       else if platform.isOpenBSD then 18
       else if platform.isAndroid then 12
       else if platform.isLinux then 18
@@ -17459,8 +17471,6 @@ with pkgs;
 
   srandrd = callPackage ../tools/X11/srandrd { };
 
-  sratoolkit = callPackage ../applications/science/biology/sratoolkit { };
-
   srecord = callPackage ../development/tools/misc/srecord { };
 
   srelay = callPackage ../tools/networking/srelay { };
@@ -23341,6 +23351,9 @@ with pkgs;
   openslp = callPackage ../development/libraries/openslp { };
 
   openstackclient = with python311Packages; toPythonApplication python-openstackclient;
+  openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: {
+    dependencies = oldAttrs.dependencies ++ oldAttrs.passthru.optional-dependencies.cli-plugins;
+  });
   barbicanclient = with python311Packages; toPythonApplication python-barbicanclient;
   glanceclient = with python311Packages; toPythonApplication python-glanceclient;
   heatclient = with python311Packages; toPythonApplication python-heatclient;
@@ -26361,8 +26374,6 @@ with pkgs;
 
   fit-trackee = callPackage ../servers/geospatial/fit-trackee { };
 
-  geoserver = callPackage ../servers/geospatial/geoserver { };
-
   mapcache = callPackage ../servers/geospatial/mapcache { };
 
   mapproxy = callPackage ../servers/geospatial/mapproxy { };
@@ -27726,10 +27737,6 @@ with pkgs;
 
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
-  wpa_supplicant_ro_ssids = wpa_supplicant.override {
-    readOnlyModeSSIDs = true;
-  };
-
   wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
   xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
@@ -27738,8 +27745,6 @@ with pkgs;
 
   xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };
 
-  xilinx-bootgen = callPackage ../tools/misc/xilinx-bootgen { };
-
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
 
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
@@ -29854,7 +29859,7 @@ with pkgs;
   inherit (callPackage ../applications/virtualization/docker {})
     docker_24 docker_25 docker_26 docker_27;
 
-  docker = docker_24;
+  docker = docker_27;
   docker-client = docker.override { clientOnly = true; };
 
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
@@ -29867,7 +29872,6 @@ with pkgs;
 
   docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
   docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
-  docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix { };
   docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };
 
 
@@ -30713,10 +30717,6 @@ with pkgs;
 
   freerdpUnstable = freerdp;
 
-  friture = callPackage ../by-name/fr/friture/package.nix {
-    python3Packages = python311Packages;
-  };
-
   g933-utils = callPackage ../tools/misc/g933-utils { };
 
   gavrasm = callPackage ../development/compilers/gavrasm { };
@@ -31238,6 +31238,7 @@ with pkgs;
   inherit (callPackages ../development/libraries/wlroots {})
     wlroots_0_16
     wlroots_0_17
+    wlroots_0_18
     wlroots;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
@@ -32026,7 +32027,7 @@ with pkgs;
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
-  lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; };
+  lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php82; };
 
   ltex-ls = callPackage ../tools/text/ltex-ls { };
 
@@ -35611,8 +35612,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  fava = callPackage ../applications/office/fava { };
-
   nux = callPackage ../tools/misc/nux { };
 
   phonemizer = with python3Packages; toPythonApplication phonemizer;
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 383ba5d73008e..837155a55407e 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -24,12 +24,17 @@
 let
 
   mkElpaDevelPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-devel-packages.nix {
-    inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages;
+    inherit (pkgs) pkgs buildPackages;
     inherit lib;
   };
 
   mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix {
-    inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages;
+    inherit (pkgs) pkgs buildPackages;
+    inherit lib;
+  };
+
+  mkNongnuDevelPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix {
+    inherit (pkgs) buildPackages;
     inherit lib;
   };
 
@@ -57,6 +62,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
   , lib ? pkgs.lib
   , elpaDevelPackages ? mkElpaDevelPackages { inherit pkgs lib; } self
   , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
+  , nongnuDevelPackages ? mkNongnuDevelPackages { inherit pkgs lib; } self
   , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self
   , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
   , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
@@ -64,6 +70,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
 }: ({}
   // elpaDevelPackages // { inherit elpaDevelPackages; }
   // elpaPackages // { inherit elpaPackages; }
+  // nongnuDevelPackages // { inherit nongnuDevelPackages; }
   // nongnuPackages // { inherit nongnuPackages; }
   // melpaStablePackages // { inherit melpaStablePackages; }
   // melpaPackages // { inherit melpaPackages; }
@@ -81,6 +88,10 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
       inherit (self) emacs;
     };
 
+    elpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/elpa.nix {
+      inherit (self) emacs;
+    };
+
     melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix {
       inherit (self) emacs;
     };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 24a8e979b0203..a457559bc8ea6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -342,13 +342,6 @@ in {
           packages.ghc963
         else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
           packages.ghc963
-        else if stdenv.hostPlatform.isDarwin then
-          # it seems like the GHC 9.6.* bindists are built with a different
-          # toolchain than we are using (which I'm guessing from the fact
-          # that 9.6.4 bindists pass linker flags our ld doesn't support).
-          # With both 9.6.3 and 9.6.4 binary it is impossible to link against
-          # the clock package (probably a hsc2hs problem).
-          packages.ghc963
         else
           packages.ghc963Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -367,13 +360,6 @@ in {
           packages.ghc963
         else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
           packages.ghc963
-        else if stdenv.hostPlatform.isDarwin then
-          # it seems like the GHC 9.6.* bindists are built with a different
-          # toolchain than we are using (which I'm guessing from the fact
-          # that 9.6.4 bindists pass linker flags our ld doesn't support).
-          # With both 9.6.3 and 9.6.4 binary it is impossible to link against
-          # the clock package (probably a hsc2hs problem).
-          packages.ghc963
         else
           packages.ghc963Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -419,13 +405,6 @@ in {
           packages.ghc963
         else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then
           packages.ghc963
-        else if stdenv.hostPlatform.isDarwin then
-          # it seems like the GHC 9.6.* bindists are built with a different
-          # toolchain than we are using (which I'm guessing from the fact
-          # that 9.6.4 bindists pass linker flags our ld doesn't support).
-          # With both 9.6.3 and 9.6.4 binary it is impossible to link against
-          # the clock package (probably a hsc2hs problem).
-          packages.ghc963
         else
           packages.ghc963Binary;
       inherit (buildPackages.python3Packages) sphinx;
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 4b47c2d974dc6..3eafa2fa782fe 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -115,7 +115,7 @@ rec {
       description = "New FFI-based API for lua-nginx-module";
       homepage = "https://github.com/openresty/lua-resty-core";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   }) {};
 
@@ -134,7 +134,7 @@ rec {
       description = "Lua-land LRU Cache based on LuaJIT FFI";
       homepage = "https://github.com/openresty/lua-resty-lrucache";
       license = licenses.bsd3;
-      maintainers = with maintainers; [ ];
+      maintainers = [ ];
     };
   }) {};
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0939db097e0b9..da8b7108816d3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1379,22 +1379,16 @@ let
     omd = callPackage ../development/ocaml-modules/omd { };
 
     opam-core = callPackage ../development/ocaml-modules/opam-core {
-      inherit (pkgs) opam unzip;
+      inherit (pkgs) opam;
     };
 
     opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { };
 
-    opam-format = callPackage ../development/ocaml-modules/opam-format {
-      inherit (pkgs) unzip;
-    };
+    opam-format = callPackage ../development/ocaml-modules/opam-format { };
 
-    opam-repository = callPackage ../development/ocaml-modules/opam-repository {
-      inherit (pkgs) unzip;
-    };
+    opam-repository = callPackage ../development/ocaml-modules/opam-repository { };
 
-    opam-state = callPackage ../development/ocaml-modules/opam-state {
-      inherit (pkgs) unzip;
-    };
+    opam-state = callPackage ../development/ocaml-modules/opam-state { };
 
     opium = callPackage ../development/ocaml-modules/opium { };
 
@@ -1716,6 +1710,8 @@ let
       inherit (pkgs) soundtouch;
     };
 
+    spdx_licenses = callPackage ../development/ocaml-modules/spdx_licenses { };
+
     speex = callPackage ../development/ocaml-modules/speex {
       inherit (pkgs) speex;
     };
@@ -1746,6 +1742,8 @@ let
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
+    swhid_core = callPackage ../development/ocaml-modules/swhid_core { };
+
     syslog = callPackage ../development/ocaml-modules/syslog { };
 
     syslog-message = callPackage ../development/ocaml-modules/syslog-message { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3714fbf466775..b6745c61c6d60 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -339,6 +339,7 @@ mapAliases ({
   nose-timer = throw "nose-timer has been removed as it depends on the abandoned nose test framework"; # added 2024-07-27
   nose-warnings-filters = throw "nose-warnings-filters has been removed as it has been unmaintained since 2016"; # added 2024-07-27
   nose_warnings_filters = nose-warnings-filters; # added 2024-01-07
+  nose-xunitmp = throw "nose-xunitmp has been removed as it depends on the abandoned nose test framework"; # added 2024-07-29
   notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02
   Nuitka = nuitka; # added 2023-02-19
   ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
@@ -480,6 +481,7 @@ mapAliases ({
   pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30
   pytwitchapi = twitchapi; # added 2022-03-07
   pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09
+  pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28
   pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19
   PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
   pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01
@@ -562,6 +564,7 @@ mapAliases ({
   suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27
   supervise_api = supervise-api; # added 2023-10-11
   suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
+  synologydsm-api = py-synologydsm-api; # added 2024-07-29
   sysv_ipc = sysv-ipc; # added 2024-01-07
   tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
   tensorflow-build_2 = tensorflow-build; # added 2021-11-25
@@ -612,6 +615,7 @@ mapAliases ({
   weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
   webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
   weboob = throw "weboob has been removed, please use woob instead"; # added 2024-07-27
+  webhelpers = throw "webhelpers has been removed because it is unmaintained and upstream is gone"; # added 2024-07-27
   websocket_client = websocket-client; # added 2021-06-15
   word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
   wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 036efa9be5ec1..8a07033929d95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -877,6 +877,8 @@ self: super: with self; {
 
   asyauth = callPackage ../development/python-modules/asyauth { };
 
+  asyncarve = callPackage ../development/python-modules/asyncarve { };
+
   async-dns = callPackage ../development/python-modules/async-dns { };
 
   async-generator = callPackage ../development/python-modules/async-generator { };
@@ -1847,6 +1849,8 @@ self: super: with self; {
 
   bthome-ble = callPackage ../development/python-modules/bthome-ble { };
 
+  bthomehub5-devicelist = callPackage ../development/python-modules/bthomehub5-devicelist { };
+
   bt-proximity = callPackage ../development/python-modules/bt-proximity { };
 
   btrees = callPackage ../development/python-modules/btrees { };
@@ -2053,6 +2057,8 @@ self: super: with self; {
 
   command-runner = callPackage ../development/python-modules/command-runner { };
 
+  commitizen = callPackage ../development/python-modules/commitizen { };
+
   connect-box = callPackage ../development/python-modules/connect-box { };
 
   connection-pool = callPackage ../development/python-modules/connection-pool { };
@@ -4310,6 +4316,8 @@ self: super: with self; {
 
   findpython = callPackage ../development/python-modules/findpython { };
 
+  finetuning-scheduler = callPackage ../development/python-modules/finetuning-scheduler { };
+
   fingerprints = callPackage ../development/python-modules/fingerprints { };
 
   finitude = callPackage ../development/python-modules/finitude { };
@@ -5636,6 +5644,8 @@ self: super: with self; {
 
   html-sanitizer = callPackage ../development/python-modules/html-sanitizer { };
 
+  html-table-parser-python3 = callPackage ../development/python-modules/html-table-parser-python3 { };
+
   html-tag-names = callPackage ../development/python-modules/html-tag-names { };
 
   html-text = callPackage ../development/python-modules/html-text { };
@@ -7242,6 +7252,8 @@ self: super: with self; {
 
   losant-rest = callPackage ../development/python-modules/losant-rest { };
 
+  lottie = callPackage ../development/python-modules/lottie { };
+
   lpc-checksum = callPackage ../development/python-modules/lpc-checksum { };
 
   lrcalc-python = callPackage ../development/python-modules/lrcalc-python { };
@@ -7940,6 +7952,8 @@ self: super: with self; {
 
   mox3 = callPackage ../development/python-modules/mox3 { };
 
+  mozart-api = callPackage ../development/python-modules/mozart-api { };
+
   mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { };
 
   mpd2 = callPackage ../development/python-modules/mpd2 { };
@@ -9120,8 +9134,6 @@ self: super: with self; {
 
   nose3 = callPackage ../development/python-modules/nose3 { };
 
-  nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { };
-
   notebook = callPackage ../development/python-modules/notebook { };
 
   notebook-shim = callPackage ../development/python-modules/notebook-shim { };
@@ -9164,6 +9176,8 @@ self: super: with self; {
 
   ntplib = callPackage ../development/python-modules/ntplib { };
 
+  nuclear = callPackage ../development/python-modules/nuclear { };
+
   nuitka = callPackage ../development/python-modules/nuitka { };
 
   nuheat = callPackage ../development/python-modules/nuheat { };
@@ -9232,6 +9246,8 @@ self: super: with self; {
 
   py-aosmith = callPackage ../development/python-modules/py-aosmith { };
 
+  py-ccm15 = callPackage ../development/python-modules/py-ccm15 { };
+
   py-deprecate = callPackage ../development/python-modules/py-deprecate { };
 
   py-ecc = callPackage ../development/python-modules/py-ecc { };
@@ -13026,8 +13042,6 @@ self: super: with self; {
 
   pyuseragents = callPackage ../development/python-modules/pyuseragents { };
 
-  pyutilib = callPackage ../development/python-modules/pyutilib { };
-
   pyuv = callPackage ../development/python-modules/pyuv { };
 
   py-vapid = callPackage ../development/python-modules/py-vapid { };
@@ -15101,8 +15115,6 @@ self: super: with self; {
 
   synergy = callPackage ../development/python-modules/synergy { };
 
-  synologydsm-api = callPackage ../development/python-modules/synologydsm-api { };
-
   syslog-rfc5424-formatter = callPackage ../development/python-modules/syslog-rfc5424-formatter { };
 
   systembridge = callPackage ../development/python-modules/systembridge { };
@@ -17192,6 +17204,8 @@ self: super: with self; {
   wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { });
   inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass;
 
+  wat = callPackage ../development/python-modules/wat { };
+
   watchdog = callPackage ../development/python-modules/watchdog {
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -17258,8 +17272,6 @@ self: super: with self; {
 
   webexteamssdk = callPackage ../development/python-modules/webexteamssdk { };
 
-  webhelpers = callPackage ../development/python-modules/webhelpers { };
-
   webob = callPackage ../development/python-modules/webob { };
 
   webrtc-noise-gain = callPackage ../development/python-modules/webrtc-noise-gain { };
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 386b8506c73ca..101dd8cf8c4df 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -1244,7 +1244,7 @@
     version = "2.0.24";
   };
   gtk3 = {
-    dependencies = ["atk" "gdk3"];
+    dependencies = ["atk" "cairo" "gdk3"];
     groups = ["default"];
     platforms = [];
     source = {